X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=0c58f41d013d72a65a93a6224eaa93dc8fe4eb97;hb=e666e2735bf831084d744027b844de9f4d3fe34d;hp=8825631771ffe80fe4ca3a7baa5261e2748f1083;hpb=3ce04a3c410c5836394417b19e70f2a95bc8a5e7;p=cubemap diff --git a/main.cpp b/main.cpp index 8825631..0c58f41 100644 --- a/main.cpp +++ b/main.cpp @@ -197,14 +197,14 @@ bool dry_run_config(const std::string &argv0, const std::string &config_filename pid_t pid = fork(); switch (pid) { case -1: - perror("fork()"); + log_perror("fork()"); free(argv0_copy); free(config_filename_copy); return false; case 0: // Child. execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, NULL); - perror(argv0_copy); + log_perror(argv0_copy); _exit(1); default: // Parent. @@ -221,7 +221,7 @@ bool dry_run_config(const std::string &argv0, const std::string &config_filename } while (err == -1 && errno == EINTR); if (err == -1) { - perror("waitpid()"); + log_perror("waitpid()"); return false; } @@ -276,7 +276,7 @@ start: // Open logs as soon as possible. open_logs(config.log_destinations); - log(NO_LEVEL, "Cubemap " SERVER_VERSION " starting."); + log(INFO, "Cubemap " SERVER_VERSION " starting."); servers = new ServerPool(config.num_servers); CubemapStateProto loaded_state; @@ -402,7 +402,7 @@ start: for ( ;; ) { execlp(argv[0], argv[0], config_filename.c_str(), "--state", buf, NULL); open_logs(config.log_destinations); - perror("execlp"); + log_perror("execlp"); log(ERROR, "re-exec of %s failed. Waiting 0.2 seconds and trying again...", argv[0]); shut_down_logging(); usleep(200000);