Revert "Update fork"

Author: Dmitry Dolenko

.gitignore

@@ -2,4 +2,3 @@ syntax: glob
 build
 example/*.log
 node_modules/
-package-lock.json

README.md

@@ -23,9 +23,10 @@ A program can then be added, removed and run as a service:
 
     service.remove ("my-service");
 
-    service.run (function () {
-        // Stop request received (i.e. a kill signal on Linux or from the
-        // Service Control Manager on Windows), so let's stop!
+    var logStream = fs.createWriteStream ("my-service.log");
+    
+    service.run (logStream, function () {
+        console.log ("stop request received");
         service.stop ();
     });
 
@@ -56,7 +57,9 @@ with a `--add` parameter, and removes the created service when called with a
               console.trace(error);
         });
     } else if (process.argv[2] == "--run") {
-        service.run (function () {
+        var logStream = fs.createWriteStream (process.argv[1] + ".log");
+        
+        service.run (logStream, function () {
             service.stop (0);
         });
         
@@ -124,7 +127,9 @@ program adding the services.
 Each of the service programs can simply start themselves as services using the
 following code:
 
-    service.run (function () {
+    var logStream = fs.createWriteStream (process.argv[1] + ".log");
+    
+    service.run (logStream, function () {
         service.stop (0);
     });
 
@@ -261,27 +266,30 @@ The following example removes the service named `my-service`:
             console.trace(error);
     });
 
-## service.run (callback)
+## service.run (stdoutLogStream, [stderrLogStream,] callback)
 
 The `run()` function will attempt to run the program as a service.
 
-**NOTE** When run the service will NOT make any changes to the `process.stdout`
-and `process.stderr` streams.  Users are required to utilise whatever logging
-modules they require to managing process logging and its destination.  Older
-versions of this module (versions before 2.0.0) would support re-directing
-these streams to a specific writeable stream, support for that was removed in
-version 2.0.0.
-
-The `callback` function will be called when the service receives a stop request,
-e.g. because the Windows Service Controller was used to send a stop request to
-the service, or a `SIGTERM` signal was received.
+The programs `process.stdout` stream will be replaced with the
+`stdoutLogStream` parameter, and the programs `process.stderr` stream
+replaced with the `stdoutLogStream` parameter (this allows the redirection of
+all `console.log()` type calls to a service specific log file).  If the
+`stderrLogStream` parameter is not specified the programs `process.stderr`
+stream will be replaced with the `stdoutLogStream` parameter.  The `callback`
+function will be called when the service receives a stop request, e.g. because
+the Windows Service Controller was used to send a stop request to the service,
+or a `SIGTERM` signal was received.
 
 The program should perform cleanup tasks and then call the `service.stop()`
 function.
 
-The following example starts a program as a service:
+The following example starts a program as a service, it uses the same log
+stream for standard output and standard error:
+
+    var logStream = fs.createWriteStream ("my-service.log");
 
-    service.run (function () {
+    service.run (logStream, function () {
+        console.log ("stop request received");
         service.stop ();
     });
 
@@ -300,14 +308,23 @@ finished performing cleanup tasks.
 The following example stops the calling program specifying a return code of
 `0`, the function will not return:
 
-    service.run (function () {
+    var logStream = fs.createWriteStream ("my-service.log");
+
+    service.run (logStream, function () {
+        console.log ("stop request received");
         service.stop (0);
     });
 
 # Example Programs
 
 Example programs are included under the modules `example` directory.
 
+# Bugs & Known Issues
+
+None, yet!
+
+Bug reports should be sent to <[email protected]>.
+
 # Changes
 
 ## Version 1.0.0 - 30/12/2014
@@ -369,29 +386,13 @@ Example programs are included under the modules `example` directory.
    `__defineGetter__()` function
  * Specify dependancies when adding a service
 
-## Version 2.0.0 - 12/02/2018
+# Roadmap
 
- * Remove support to override stdout/stderr with a logstream (let users use
-   their required/own logging modules) - the run() function now only accepts
-   one argument whereas previously this was either two or three
-
-## Version 2.1.0 - 02/05/2018
-
- * Support Node.js 10
-
-## Version 2.1.2 - 06/06/2018
-
- * Set NoSpaceships Ltd to be the owner and maintainer
-
-## Version 2.1.3 - 07/06/2018
-
- * Remove redundant sections from README.md
+Suggestions and requirements should be sent to <[email protected]>.
 
 # License
 
-Copyright (c) 2018 NoSpaceships Ltd <[email protected]>
-
-Copyright (c) 2014 Stephen Vickers <[email protected]>
+Copyright (c) 2014 Stephen Vickers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -410,3 +411,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+# Author
+
+Stephen Vickers <[email protected]>

example/periodic-logger.js

@@ -38,16 +38,15 @@ if (process.argv[2] == "--add" && process.argv.length >= 4) {
 			console.log(error.toString());
 	});
 } else if (process.argv[2] == "--run") {
+	var logStream = fs.createWriteStream (process.argv[1] + ".log");
 	service.run (logStream, function () {
 		service.stop (0);
 	});
 
-	var logStream = fs.createWriteStream(process.argv[1] + ".log");
-
 	// Here is our long running code, simply print a date/time string to
 	// our log file
 	setInterval (function () {
-		logStream.write(new Date ().toString () + "\n");
+		console.log(new Date ().toString ());
 	}, 1000);
 } else {
 	usage ();

index.js

@@ -430,8 +430,16 @@ function remove (name, cb) {
 	}
 }
 
-function run (stopCallback) {
+function run (stdoutLogStream, stderrLogStream, stopCallback) {
+	if (! stopCallback) {
+		stopCallback = stderrLogStream;
+		stderrLogStream = stdoutLogStream;
+	}
+
 	if (! runInitialised) {
+		process.stdout.write = stdoutLogStream.write.bind(stdoutLogStream);
+		process.stderr.write = stderrLogStream.write.bind(stderrLogStream);
+		
 		if (os.platform() == "win32") {
 			setInterval (function () {
 				if (isStopRequested ()) {

package.json

@@ -1,27 +1,23 @@
 {
   "name": "os-service",
-  "version": "2.1.3",
+  "version": "1.5.0",
   "description": "Run Node.JS programs as native Operating System Services.",
   "main": "index.js",
   "directories": {
     "example": "example"
   },
   "dependencies": {
-    "nan": "2.10.x"
+    "nan": "2.3.x"
   },
-  "contributors": [
+  "contributors": [ 
     {
       "name": "Stephen Vickers",
-      "email": "[email protected]"
-    },
-    {
-      "name": "NoSpaceships Ltd",
-      "email": "[email protected]"
-    }
+      "email": "[email protected]"
+    } 
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/nospaceships/node-os-service.git"
+    "url": "git://github.com/stephenwvickers/node-os-service.git"
   },
   "keywords": [
     "background-process",
@@ -30,10 +26,10 @@
     "linux-daemon",
     "linux-service",
     "service",
-    "windows",
-    "windows-daemon",
-    "windows-service"
+  	 "windows",
+  	 "windows-daemon",
+  	 "windows-service"
   ],
-  "author": "NoSpaceships Ltd <hello@nospaceships.com>",
+  "author": "Stephen Vickers <stephen.vickers.sv@gmail.com>",
   "license": "MIT"
 }