add dry-run option and log level option

discover.py

@@ -72,4 +72,4 @@ if __name__ == "__main__":
 	else:
 		import start
 		for service in autostarts:
-			start.change_service(service, args.action, pre_cmd=args.pre, post_cmd=args.post)
+			start.change_service(service, args.action, pre_cmd=args.pre, post_cmd=args.post, dry_run=args.dry_run)

docker-autostart.openrc

@@ -9,11 +9,9 @@ depend(){
 }
 
 start(){
-	#python3 /opt/docker/docker-autostart/discover.py /opt/docker/ /opt/docker/services/
 	$command $command_args
 }
 
 stop(){
-	#python3 -a down /opt/docker/docker-autostart/discover.py /opt/docker/ /opt/docker/services/
 	$command $command_args -a down
-}
+}

start.py

@@ -7,26 +7,30 @@ import sys
 
 log = logging.getLogger(__name__)
 
+def run(cmd, kwargs={}, dry_run=False):
+	if dry_run:
+		log.info(f"tried to run: `{cmd}, {kwargs}`, dry_run=True", extra={"path": "/dry/run/", "cmd": cmd, "returncode": -99})
+		return subprocess.CompletedProcess(cmd, -99)
+	return subprocess.run(cmd, **kwargs)
 
-def change_service(path, action, pre_cmd=None, post_cmd=None):
+def change_service(path, action, pre_cmd=None, post_cmd=None, dry_run=False):
 	cmd = ["docker-compose"] + action.split()
 	if path.endswith("/docker-compose.yml"):
 		path = path[:-len("/docker-compose.yml")]
 	args = {
-		"args": cmd,
 		"cwd": path,
 	}
 	if post_cmd:
 		args["capture_output"] = True
 		args["text"] = True
 	if pre_cmd:
-		subprocess.run(pre_cmd.format(path=path, cmd=cmd, step="pre").split())
-	r = subprocess.run(**args)
-	log.info(f"processed {path}", extra={"path": path, "cmd": cmd, "returncode": r.returncode})
+		run(pre_cmd.format(path=path, cmd=cmd, step="pre").split(), dry_run=dry_run)
+	r = run(cmd, args, dry_run=dry_run)
+	log.info(f"processed {path} (status {r.returncode})", extra={"path": path, "cmd": cmd, "returncode": r.returncode})
 	if post_cmd:
 		if r.stdout: print(r.stdout)
 		if r.stderr: print(r.stderr, file=sys.stderr)
-		subprocess.run(post_cmd.format(path=path, cmd=cmd, step="post", returncode=r.returncode, stdout=r.stdout, stderr=r.stderr).split())
+		run(post_cmd.format(path=path, cmd=cmd, step="post", returncode=r.returncode, stdout=r.stdout, stderr=r.stderr).split(), dry_run=dry_run)
 		print()
 
 
@@ -50,23 +54,25 @@ def get_loader(config_file):
 		return load_stdin
 	return load_raw
 
-def apply(config_file, action, pre=None, post=None):
+def apply(config_file, action, pre=None, post=None, dry_run=False):
 	load = get_loader(config_file)
 	for path in load(config_file):
-		change_service(path, action, pre_cmd=pre, post_cmd=post)
+		change_service(path, action, pre_cmd=pre, post_cmd=post, dry_run=dry_run)
 
 def base_args(desc):
 	parser = argparse.ArgumentParser(description=desc)
 	parser.add_argument("--action", "-a", default="up -d", help="docker-compose action to apply, default: up -d")
 	parser.add_argument("--pre", "-s", help="pre-exec: command to run before each action")
 	parser.add_argument("--post", "-e", help="post-exec: command to run after each action")
+	parser.add_argument("--dry-run", "-d", action="store_true", help="dry run: only print commands")
+	parser.add_argument("--log", default="INFO", choices=["INFO","DEBUG","WARNING"], help="log level (default: %(default)s)")
 	return parser
 	
 
 if __name__ == "__main__":
-	logging.basicConfig(format="%(message)s (status %(returncode)s)", level=logging.INFO)
 	parser = base_args("Docker-compose Autostart")
 	parser.add_argument("config_file", default="-", help="json file, plain text list or - for stdin")
 	args = parser.parse_args()
+	logging.basicConfig(format="%(message)s", level=getattr(logging, args.log))
 
-	apply(args.config_file, args.action, pre=args.pre, post=args.post)
+	apply(args.config_file, args.action, pre=args.pre, post=args.post, dry_run=args.dry_run)