Add option to run scc-daemon in foreground (#90)

Author: Golbinex

scc/bin/scc_daemon.py

@@ -14,6 +14,7 @@ def main() -> None:
 	parser.add_argument("command", type=str, choices=["start", "stop", "restart", "debug"])
 	parser.add_argument("--alone", action="store_true", help="prevent scc-daemon from launching osd-daemon and autoswitch-daemon")
 	parser.add_argument("--once", action="store_true", help="use with 'stop' to send single SIGTERM without waiting for daemon to exit")
+	parser.add_argument("--foreground", action="store_true", help="run scc-daemon in foreground")
 	daemon = SCCDaemon(get_pid_file(), get_daemon_socket())
 	args = parser.parse_args()
 	daemon.alone = args.alone
@@ -25,7 +26,7 @@ def main() -> None:
 		# from config
 
 	if args.command == "start":
-		daemon.start()
+		daemon.start(foreground = args.foreground)
 	elif args.command == "stop":
 		daemon.stop(once = args.once)
 	elif args.command == "restart":

scc/lib/daemon.py

@@ -73,7 +73,7 @@ def delpid(self):
 		"""Delete pid file"""
 		os.remove(self.pidfile)
 
-	def start(self):
+	def start(self, foreground=False):
 		"""Start the daemon."""
 
 		# Check for a pidfile to see if the daemon already runs
@@ -103,7 +103,10 @@ def start(self):
 			sys.stderr.write("Overwriting stale pidfile\n")
 
 		# Start the daemon
-		self.daemonize()
+		if not foreground:
+			self.daemonize()
+		else:
+			self.write_pid()
 		syslog.syslog(syslog.LOG_INFO, '{}: started'.format(os.path.basename(sys.argv[0])))
 		self.on_start()
 		while True: