reload and stop commands, and log file

README.md

@@ -9,15 +9,20 @@ Run `npm install -g dedaemon` as root.
 
 ## Usage
 
-`dedaemon <config file>`
+```
+dedaemon <config file> -- Start a new instance of dedaemon
+dedaemon stop          -- Stop all running istances of dedaemon
+dedaemon reload        -- Reload config file
+```
 
 e.g:
 
 `dedaemon ~/.config/dedaemon.hcnf`
 
 You probably want to run that on startup. If you're running i3wm, that means
-adding `exec --no-startup-id dedaemon ~/.config/dedaemon.hcnf` to
-`~/.i3/config`.
+adding `exec --no-startup-id dedaemon stop; dedaemon~/.config/dedaemon.hcnf` to
+`~/.i3/config`. This first stop any running instance of dedaemon, then runs a
+new one.
 
 ## Configuration
 

dedaemon.js

@@ -5,6 +5,9 @@ var parseConf = require("./js/parse-conf");
 var async = require("./js/async");
 var udev = require("./udev");
 
+var execSync = require("child_process").execSync
+var fs = require("fs");
+
 var modules = {
 	display: require("./modules/display"),
 	input: require("./modules/input"),
@@ -14,15 +17,31 @@ var modules = {
 
 if (!process.argv[2]) {
 	console.error("Usage:", process.argv[1], "<config file>");
-	console.error("      ", process.argv[1], "list");
+	console.error("      ", process.argv[1], "list   -- List display and input devices");
+	console.error("      ", process.argv[1], "reload -- Reload the running daemon");
 	process.exit(1);
 }
 
 var config;
 
+var fatalError = false;
 function createLogger(name) {
 	function log(pre, msg) {
-		console.error(pre+msg.join(" "));
+		var str = pre+msg.join(" ");
+
+		console.error(str);
+		try {
+			fs.appendFileSync(config.general.log, str+"\n");
+		} catch (err) {
+			if (!fatalError) {
+				fatalError = true;
+				console.error("FATAL: Failed to write to log file!!");
+				console.error(err.toString());
+				stopAll(() => {
+					process.exit(1);
+				});
+			}
+		};
 	}
 
 	return {
@@ -32,7 +51,14 @@ function createLogger(name) {
 	}
 }
 
+var logger = createLogger("dedaemon");
+
 function startAll() {
+	try {
+		fs.renameSync(config.general.log, config.general.log+".old");
+	} catch (err) {}
+	fs.writeFileSync(config.general.log, "");
+
 	Object.keys(modules).forEach(i => {
 		var mod = modules[i];
 		var conf = config[i];
@@ -51,9 +77,60 @@ function stopAll(cb) {
 }
 
 function onTerm() {
-	console.error("Exiting...");
-	stopAll(() => process.exit(1));
-	udev.exit();
+	logger.info("Exiting...");
+	stopAll(() => {
+		udev.exit();
+		process.exit(1)
+	});
+}
+
+function reload() {
+	try {
+		config = parseConf(process.argv[2]);
+	} catch (err) {
+		logger.error(
+			"Tried to reload, but parsing the config file failed:",
+			err.toString());
+		return;
+	}
+	logger.info("Reloading.");
+
+	stopAll(() => {
+		startAll();
+	});
+}
+
+function loglol(sig) {
+	return function() {
+		logger.info("Received signal", sig);
+	}
+}
+
+function killRunningDaemon(signal, once) {
+	var cmd =
+		"pgrep -a node | "+
+		"grep dedaemon | "+
+		"grep -ve stop -e reload | "+
+		"cut -d' ' -f1";
+
+	var out = execSync(cmd)
+		.toString();
+
+	var lines = out.split("\n").filter(l => l !== "");
+	if (lines.length > 1 && once) {
+		console.error("There are multiple dedaemon processes running.");
+		process.exit(1);
+	}
+	if (lines.length === 0) {
+		console.error("No dedaemon process is running.");
+		process.exit(1);
+	}
+
+	lines.forEach(line => {
+		execSync("kill -s "+signal+" "+line);
+		console.error("Sent", "SIG"+signal, "to process", line);
+	});
+	process.exit(0);
 }
 
 if (process.argv[2] === "list") {
@@ -65,16 +142,21 @@ if (process.argv[2] === "list") {
 			process.exit(0);
 		});
 	});
+} else if (process.argv[2] === "reload") {
+	killRunningDaemon("USR1", true);
+} else if (process.argv[2] === "stop") {
+	killRunningDaemon("TERM");
 } else {
 	var config = parseConf(process.argv[2]);
 
 	syscheck(ok => {
 		if (ok)
-			startAll();
+			setTimeout(startAll, 1000);
 		else
 			console.error("Missing binaries, exiting.");
 	});
 
 	process.on("SIGTERM", onTerm);
 	process.on("SIGINT", onTerm);
+	process.on("SIGUSR1", reload);
 }

example.hcnf

@@ -1,3 +1,7 @@
+general {
+	log "$(HOME)/.dedaemon.log"
+}
+
 display * {
 	mode max
 	rate max

js/parse-conf.js

@@ -3,6 +3,12 @@ var hconfig = require("hconfig");
 module.exports = parse;
 
 var configStructure = {
+	general: {
+		count: "once",
+		props: {
+			log: "string",
+		},
+	},
 	display: {
 		count: "many",
 		props: {