projects / psensor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added log_info fct
[psensor.git] / src / server / server.c
diff --git a/src/server/server.c b/src/server/server.c
index f344ab8..505d511 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -48,6 +48,9 @@
 
 static const char *DEFAULT_LOG_FILE = "/var/log/psensor-server.log";
 
+#define HTML_STOP_REQUESTED \
+(_("<html><body><p>Server stop requested</p></body></html>"))
+
 static const char *program_name;
 
 #define DEFAULT_PORT 3131
@@ -86,8 +89,8 @@ void print_help()
 {
        printf(_("Usage: %s [OPTION]...\n"), program_name);
 
-       puts(_("psensor-server is an HTTP server "
-              "for monitoring hardware sensors remotely."));
+       puts(_("psensor-server is an HTTP server for monitoring hardware "
+              "sensors remotely."));
 
        puts("");
        puts("Options:");
@@ -99,10 +102,9 @@ void print_help()
               "  -w,--wdir=DIR         directory containing webserver pages"));
 
        puts("");
-       puts(_("  -d, --debug=LEVEL   "
+       puts(_("  -d, --debug=LEVEL     "
               "set the debug level, integer between 0 and 3"));
-       puts(_("  -l, --log-file=PATH "
-              "set the log file to PATH"));
+       puts(_("  -l, --log-file=PATH   set the log file to PATH"));
 
        puts("");
        printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT);
@@ -176,8 +178,7 @@ create_response_api(const char *nurl,
        } else if (!strcmp(nurl, URL_API_1_0_SERVER_STOP)) {
 
                server_stop_requested = 1;
-               page = strdup(_("<html><body><p>"
-                               "Server stop requested</p></body></html>"));
+               page = strdup(HTML_STOP_REQUESTED);
        }
 
        if (page) {
@@ -328,7 +329,7 @@ int main(int argc, char *argv[])
        log_file = NULL;
 
        while ((optc = getopt_long(argc, argv,
-                                  "vhp:w:d:", long_options, NULL)) != -1) {
+                                  "vhp:w:d:l:", long_options, NULL)) != -1) {
                switch (optc) {
                case 'w':
                        if (optarg)
@@ -346,9 +347,7 @@ int main(int argc, char *argv[])
                        exit(EXIT_SUCCESS);
                case 'd':
                        log_level = atoi(optarg);
-                       log_printf(LOG_INFO,
-                                  _("Enables debug mode: %d"),
-                                  log_level);
+                       log_info(_("Enables debug mode: %d"), log_level);
                        break;
                case 'l':
                        if (optarg)
@@ -394,9 +393,9 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       log_printf(LOG_INFO, _("Web server started on port: %d"), port);
-       log_printf(LOG_INFO, _("WWW directory: %s"), server_data.www_dir);
-       log_printf(LOG_INFO, _("URL: http://localhost:%d"), port);
+       log_info(_("Web server started on port: %d"), port);
+       log_info(_("WWW directory: %s"), server_data.www_dir);
+       log_info(_("URL: http://localhost:%d"), port);
 
        while (!server_stop_requested) {
                pthread_mutex_lock(&mutex);
psensor