diff options
| author | David Härdeman <david@hardeman.nu> | 2020-07-07 18:41:38 +0200 |
|---|---|---|
| committer | David Härdeman <david@hardeman.nu> | 2020-07-07 18:41:38 +0200 |
| commit | 90e27b4356f2a6ab98e812c4096b0b76f94a8fb3 (patch) | |
| tree | 7c900e498c426611c90ef8b2ba80d141456d9552 /minecproxy/server.c | |
| parent | 0e2db6328946180c47bc09a486fe38ca0364e2af (diff) | |
Flesh out the ping implementation
Diffstat (limited to 'minecproxy/server.c')
| -rw-r--r-- | minecproxy/server.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/minecproxy/server.c b/minecproxy/server.c index d24c0ad..b1e9b05 100644 --- a/minecproxy/server.c +++ b/minecproxy/server.c @@ -18,9 +18,9 @@ #include "server-config.h" #include "server-proxy.h" #include "server-rcon.h" -#include "shared/config-parser.h" #include "idle.h" -#include "systemd.h" +#include "shared/config-parser.h" +#include "shared/systemd.h" void server_refdump(struct server *server) { @@ -218,13 +218,15 @@ static bool server_exec(struct server *server, const char *cmd) static bool server_check_running(struct server *server) { + const char *error; + assert_return(server, false); /* FIXME: other methods, rcon? */ if (server->scfg.systemd_service) { verbose("%s: checking if systemd service is running", server->name); - if (systemd_service_running(server)) { + if (systemd_service_running(&server->scfg, &error)) { server->state = SERVER_STATE_RUNNING; return true; } else { @@ -252,7 +254,7 @@ bool server_start(struct server *server) server->name, server->scfg.systemd_service); - if (systemd_service_start(server)) { + if (systemd_service_start(&server->scfg)) { server->state = SERVER_STATE_RUNNING; return true; } else @@ -281,7 +283,7 @@ bool server_stop(struct server *server) verbose("Stopping server %s via systemd (%s)", server->name, server->scfg.systemd_service); - if (systemd_service_stop(server)) { + if (systemd_service_stop(&server->scfg)) { server->state = SERVER_STATE_STOPPED; return true; } else |