pgserve 1.0.5 → 1.0.7

package/bin/pglite-server.js

@@ -179,10 +179,13 @@ async function main() {
   const options = parseArgs();
   const memoryMode = !options.dataDir;
 
-  console.log(`
+  // Only print header if not a cluster worker (workers get PGSERVE_WORKER env)
+  if (!process.env.PGSERVE_WORKER) {
+    console.log(`
 pgserve - Embedded PostgreSQL Server
 =====================================
 `);
+  }
 
   try {
     let server;
@@ -254,16 +257,18 @@ Press Ctrl+C to stop
 `);
     }
 
-    // Graceful shutdown
-    const shutdown = async () => {
-      console.log('\nShutting down...');
-      await server.stop();
-      console.log('Server stopped.');
-      process.exit(0);
-    };
+    // Graceful shutdown (only for primary/single-process, workers handle via IPC)
+    if (!process.env.PGSERVE_WORKER) {
+      const shutdown = async () => {
+        console.log('\nShutting down...');
+        await server.stop();
+        console.log('Server stopped.');
+        process.exit(0);
+      };
 
-    process.on('SIGINT', shutdown);
-    process.on('SIGTERM', shutdown);
+      process.on('SIGINT', shutdown);
+      process.on('SIGTERM', shutdown);
+    }
 
     // Keep process alive
     await new Promise(() => {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgserve",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Embedded PostgreSQL server with true concurrent connections - zero config, auto-provision databases",
   "main": "src/index.js",
   "type": "module",

package/src/cluster.js

@@ -13,7 +13,7 @@ import cluster from 'cluster';
 import os from 'os';
 import net from 'net';
 import pg from 'pg';
-import pino from 'pino';
+import { createLogger } from './logger.js';
 import { PostgresManager } from './postgres.js';
 import { extractDatabaseNameFromSocket } from './protocol.js';
 import { EventEmitter } from 'events';
@@ -34,7 +34,7 @@ class ClusterRouter extends EventEmitter {
     this.autoProvision = options.autoProvision !== false;
     this.maxConnections = options.maxConnections || 1000;
 
-    this.logger = pino({ level: options.logLevel || 'info' });
+    this.logger = createLogger({ level: options.logLevel || 'info' });
     this.adminClient = null;
     this.server = null;
     this.connections = new Set();
@@ -74,6 +74,8 @@ class ClusterRouter extends EventEmitter {
       }
 
       this.adminClient = new pg.Client(connectionConfig);
+      // Suppress errors during shutdown (PostgreSQL terminating connections)
+      this.adminClient.on('error', () => {});
       await this.adminClient.connect();
     }
 
@@ -178,7 +180,11 @@ class ClusterRouter extends EventEmitter {
     this.connections.clear();
 
     if (this.adminClient) {
-      await this.adminClient.end();
+      try {
+        await this.adminClient.end();
+      } catch {
+        // Ignore - connection may already be terminated
+      }
     }
 
     if (this.server) {
@@ -200,7 +206,7 @@ export async function startClusterServer(options = {}) {
     console.log(`[pgserve] Cluster mode: ${numWorkers} workers`);
 
     // PRIMARY: Start our embedded PostgreSQL (single instance)
-    const logger = pino({ level: options.logLevel || 'info' });
+    const logger = createLogger({ level: options.logLevel || 'info' });
     const pgManager = new PostgresManager({
       dataDir: options.baseDir,
       port: pgPort,
@@ -231,11 +237,18 @@ export async function startClusterServer(options = {}) {
       workers.set(worker.id, worker);
     }
 
-    // Restart dead workers
+    // Track shutdown state to prevent worker restart during shutdown
+    let shuttingDown = false;
+
+    // Restart dead workers (unless shutting down)
     cluster.on('exit', (worker, code, signal) => {
-      console.log(`[pgserve] Worker ${worker.id} died (${signal || code}), restarting...`);
       workers.delete(worker.id);
 
+      if (shuttingDown) {
+        return; // Don't restart during shutdown
+      }
+
+      console.log(`[pgserve] Worker ${worker.id} died (${signal || code}), restarting...`);
       const newWorker = cluster.fork({
         PGSERVE_WORKER: 'true',
         PGSERVE_PORT: String(port),
@@ -270,6 +283,7 @@ export async function startClusterServer(options = {}) {
       pgSocketPath,
       stop: async () => {
         console.log('[pgserve] Stopping cluster...');
+        shuttingDown = true; // Prevent worker restart during shutdown
         for (const worker of workers.values()) {
           worker.send({ type: 'shutdown' });
         }

package/src/logger.js

@@ -0,0 +1,39 @@
+/**
+ * Shared Logger Configuration
+ *
+ * Provides colorful, human-readable logging via pino-pretty.
+ * All modules should use createLogger() for consistent output.
+ */
+
+import pino from 'pino';
+
+/**
+ * Create a configured pino logger with pretty output
+ * @param {Object} options - Logger options
+ * @param {string} options.level - Log level (default: 'info')
+ * @param {string} options.component - Component name for log context
+ * @returns {pino.Logger} Configured pino logger
+ */
+export function createLogger(options = {}) {
+  const level = options.level || process.env.LOG_LEVEL || 'info';
+
+  const logger = pino({
+    level,
+    transport: {
+      target: 'pino-pretty',
+      options: {
+        colorize: true,
+        ignore: 'pid,hostname',           // Remove noise
+        translateTime: 'HH:MM:ss',        // Short timestamp
+        hideObject: true,                 // Hide JSON attributes for clean output
+      }
+    }
+  });
+
+  // Return child logger with component if specified
+  if (options.component) {
+    return logger.child({ component: options.component });
+  }
+
+  return logger;
+}

package/src/restore.js

@@ -15,7 +15,7 @@
 
 import pg from 'pg';
 import { from as copyFrom, to as copyTo } from 'pg-copy-streams';
-import pino from 'pino';
+import { createLogger } from './logger.js';
 
 /**
  * Match database name against patterns (supports wildcards)
@@ -46,7 +46,7 @@ export class RestoreManager {
     this.targetPort = options.targetPort;            // Local embedded PostgreSQL port
     this.targetSocketPath = options.targetSocketPath; // Unix socket path (optional)
 
-    this.logger = options.logger || pino({ level: options.logLevel || 'info' }).child({ component: 'restore' });
+    this.logger = options.logger || createLogger({ level: options.logLevel || 'info', component: 'restore' });
 
     // Connection pools (lazy initialized)
     this.sourcePool = null;

package/src/router.js

@@ -19,7 +19,7 @@ import { RestoreManager } from './restore.js';
 import { Dashboard } from './dashboard.js';
 import { extractDatabaseNameFromSocket } from './protocol.js';
 import { EventEmitter } from 'events';
-import pino from 'pino';
+import { createLogger } from './logger.js';
 
 /**
  * Multi-Tenant Router Server
@@ -39,13 +39,7 @@ export class MultiTenantRouter extends EventEmitter {
 
     // Pino logger (ultra-fast structured logging)
     const logLevel = options.logLevel || 'info';
-    this.logger = options.logger || pino({
-      level: logLevel,
-      transport: logLevel === 'debug' ? {
-        target: 'pino-pretty',
-        options: { colorize: true }
-      } : undefined
-    });
+    this.logger = options.logger || createLogger({ level: logLevel });
 
     // Sync options (async replication to real PostgreSQL)
     this.syncTo = options.syncTo || null;

package/src/sync.js

@@ -6,7 +6,7 @@
  */
 
 import pg from 'pg';
-import pino from 'pino';
+import { createLogger } from './logger.js';
 
 /**
  * Match database name against patterns (supports wildcards)
@@ -36,7 +36,7 @@ export class SyncManager {
     this.sourcePort = options.sourcePort;          // pgserve PostgreSQL port
     this.sourceSocketPath = options.sourceSocketPath; // pgserve socket path (optional)
 
-    this.logger = pino({ level: options.logLevel || 'info' }).child({ component: 'sync' });
+    this.logger = createLogger({ level: options.logLevel || 'info', component: 'sync' });
 
     this.sourcePool = null;  // Connection to pgserve's PostgreSQL
     this.targetPool = null;  // Connection to real PostgreSQL