From 2a572e5bb0e96d44b16ab62a1386f30a3b4f389f Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Tue, 26 Jan 2016 14:05:29 +0100 Subject: [PATCH] Fix #323 Logs are now equivalent to 'tail' command on the log file --- bin/daemon | 16 +++++----------- package.json | 1 - ucoin.sh | 8 +++++++- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/bin/daemon b/bin/daemon index ea0c56fe8..48ffe57e8 100755 --- a/bin/daemon +++ b/bin/daemon @@ -3,7 +3,6 @@ var directory = require('../app/lib/directory'); var path = require('path'); -var Tail = require('always-tail'); var daemon = require("daemonize2").setup({ main: "ucoind", @@ -21,16 +20,6 @@ switch (process.argv[2]) { daemon.stop(); break; - case "logs": - var tail = new Tail(directory.INSTANCE_HOMELOG_FILE, '\n', { - interval: 5, - start: 0 - }); - tail.on("line", function(data) { - console.log(data); - }); - break; - case "restart": daemon = require("daemonize2").setup({ main: "ucoind", @@ -47,6 +36,11 @@ switch (process.argv[2]) { }); break; + case "logs": + console.log(directory.INSTANCE_HOMELOG_FILE); + process.exit(0); + break; + default: console.log("Usage: [start|stop|restart]"); } diff --git a/package.json b/package.json index 328b4e163..026e70c7b 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "url": "https://github.com/ucoin-io/ucoin/issues" }, "dependencies": { - "always-tail": "0.2.0", "async": "0.2.9", "bindings": "1.2.1", "co": "4.6.0", diff --git a/ucoin.sh b/ucoin.sh index a13c1ddfb..59f3d4370 100755 --- a/ucoin.sh +++ b/ucoin.sh @@ -9,6 +9,7 @@ ucoind() { local NODE + local LOGS_FILE if [ -z "$DEV_MODE" ]; then @@ -35,10 +36,15 @@ ucoind() { # UCOIN DAEMON MANAGEMENT #--------------------------------- - start|stop|restart|logs) + start|stop|restart) $NODE "$UCOIN_DIR/bin/daemon" $* ;; + logs) + LOGS_FILE=`$NODE "$UCOIN_DIR/bin/daemon" $*` + tail -f -n 500 "$LOGS_FILE" + ;; + #--------------------------------- # UCOIN CLI COMMANDS #--------------------------------- -- GitLab