Save server logs by day instead of by execution. Display server process ID on every...

diff --git a/src/bin/nano-pow.sh b/src/bin/nano-pow.sh
index 5fa0d37fd12ffb11925683f679994532b75a4866..cc56e44ed162f21b91b15fe2776c0fe2c9db24d4 100755 (executable)
--- a/src/bin/nano-pow.sh
+++ b/src/bin/nano-pow.sh
@@ -10,7 +10,7 @@ NANO_POW_LOGS="$NANO_POW_HOME"/logs;
 mkdir -p "$NANO_POW_LOGS";
 if [ "$1" = '--server' ]; then
        shift;
-       node "$SCRIPT_DIR"/server.js > "$NANO_POW_LOGS"/nano-pow-server-$(date -u -Iseconds).log 2>&1 & echo "$!" > "$NANO_POW_HOME"/server.pid;
+       node "$SCRIPT_DIR"/server.js >> "$NANO_POW_LOGS"/nano-pow-server-$(date -I).log 2>&1 & echo "$!" > "$NANO_POW_HOME"/server.pid;
        sleep 0.1;
        if [ "$(ps | grep $(cat $NANO_POW_HOME/server.pid))" = '' ]; then
                cat $(ls -td "$NANO_POW_LOGS"/* | head -n1);

diff --git a/src/bin/server.ts b/src/bin/server.ts
index 0a98ed7ee75b6c2e1ef92391b0657c142ef7d829..7b571ee612ff85b482aeaaa16bb71efc2860897f 100755 (executable)
--- a/src/bin/server.ts
+++ b/src/bin/server.ts
@@ -16,7 +16,15 @@ import type { NanoPowOptions, WorkGenerateRequest, WorkGenerateResponse, WorkVal
 * to only output when debug mode is enabled.
 */
 function log (...args: any[]): void {
-       if (CONFIG.DEBUG) console.log(new Date(Date.now()).toLocaleString(), 'NanoPow', args)
+       if (CONFIG.DEBUG) {
+               const d = new Date(Date.now())
+               const opts: Intl.DateTimeFormatOptions = {
+                       hour12: false,
+                       dateStyle: 'medium',
+                       timeStyle: 'medium'
+               }
+               console.log(d.toLocaleString(navigator.language, opts), `NanoPow[${process.pid}]:`, args)
+       }
 }
 
 process.title = 'NanoPow Server'
@@ -226,6 +234,7 @@ log('Puppeteer initialized')
 // Listen on configured port
 server.listen(CONFIG.PORT, async (): Promise<void> => {
        const { port } = server.address() as AddressInfo
-       log(`Server process ${process.pid} listening on port ${port}`)
+       CONFIG.PORT = port
+       log(`Server listening on port ${port}`)
        process.send?.({ type: 'listening', port })
 })