status

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 7fc5892..f06ea5b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,7 @@
 #include "lmsensor.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
+#include "ui_status.h"
 
 #ifdef HAVE_UNITY
 #include "ui_unity.h"
@@ -73,7 +74,7 @@
 
 static const char *program_name;
 
-void print_version()
+static void print_version()
 {
        printf("psensor %s\n", VERSION);
        printf(_("Copyright (C) %s jeanfi@gmail.com\n\
@@ -84,7 +85,7 @@ There is NO WARRANTY, to the extent permitted by law.\n"),
               "2010-2011");
 }
 
-void print_help()
+static void print_help()
 {
        printf(_("Usage: %s [OPTION]...\n"), program_name);
 
@@ -131,6 +132,18 @@ update_psensor_values_size(struct psensor **sensors, struct config *cfg)
        }
 }
 
+static void log_measures(struct psensor **sensors)
+{
+       if (log_level == LOG_DEBUG)
+               while (*sensors) {
+                       log_printf(LOG_DEBUG, "%s %.2f",
+                                  (*sensors)->name,
+                                  psensor_get_current_value(*sensors));
+
+                       sensors++;
+               }
+}
+
 void update_psensor_measures(struct ui_psensor *ui)
 {
        struct psensor **sensors = ui->sensors;
@@ -154,6 +167,9 @@ void update_psensor_measures(struct ui_psensor *ui)
 #ifdef HAVE_LIBATIADL
                amd_psensor_list_update(sensors);
 #endif
+
+               log_measures(sensors);
+
                g_mutex_unlock(ui->sensors_mutex);
 
                sleep(cfg->sensor_update_interval);
@@ -299,7 +315,7 @@ static void log_init()
        path = malloc(strlen(dir)+1+strlen("log")+1);
        sprintf(path, "%s/%s", dir, "log");
 
-       log_open(path, LOG_INFO);
+       log_open(path);
 
        free(dir);
        free(path);
@@ -309,6 +325,7 @@ static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
        {"url", required_argument, 0, 'u'},
+       {"debug", no_argument, 0, 'd'},
        {0, 0, 0, 0}
 };
 
@@ -330,7 +347,7 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
 #endif
 
-       while ((optc = getopt_long(argc, argv, "vhu:", long_options,
+       while ((optc = getopt_long(argc, argv, "vhdu:", long_options,
                                   NULL)) != -1) {
                switch (optc) {
                case 'u':
@@ -343,6 +360,10 @@ int main(int argc, char **argv)
                case 'v':
                        print_version();
                        exit(EXIT_SUCCESS);
+               case 'd':
+                       printf(_("Enables debug mode.\n"));
+                       log_level = LOG_DEBUG;
+                       break;
                default:
                        cmdok = 0;
                        break;
@@ -425,8 +446,12 @@ int main(int argc, char **argv)
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
        ui_appindicator_init(&ui);
+#else
+       ui_status_init();
 #endif
 
+       gdk_notify_startup_complete();
+
        /* main loop */
        gtk_main();
 
@@ -440,10 +465,19 @@ int main(int argc, char **argv)
 #ifdef HAVE_LIBATIADL
        amd_cleanup();
 #endif
+#ifdef HAVE_REMOTE_SUPPORT
+       rsensor_cleanup();
+#endif
 
        psensor_list_free(ui.sensors);
        ui.sensors = NULL;
 
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+       ui_appindicator_cleanup();
+#else
+       ui_status_cleanup();
+#endif
+
        g_mutex_unlock(ui.sensors_mutex);
 
        config_cleanup();