List log entries

[gregoa/zavai.git] / src / zavai.vala

diff --git a/src/zavai.vala b/src/zavai.vala
index 3b467f0574fce38872c83ff80d8b64609060737a..29df675775917ad12bb4047c1e2c3fadd2cb73f8 100644 (file)
--- a/src/zavai.vala
+++ b/src/zavai.vala
@@ -44,7 +44,11 @@ static Posix.pid_t is_running()
 static void make_pidfile()
 {
        string pidfile = zavai.config.homedir + "/" + pidfilename + ".pid";
-       FileUtils.set_contents(pidfile, "%d".printf(Posix.getpid()));
+    try {
+        FileUtils.set_contents(pidfile, "%d".printf(Posix.getpid()));
+    } catch (FileError e) {
+        zavai.log.error("Cannot create pidfile " + pidfile + ": " + e.message);
+    }
 }
 
 static void on_kill(int sig)
@@ -75,7 +79,12 @@ static int main (string[] args) {
                        arg_description = null },
                OptionEntry()
        };
-    Gtk.init_with_args(ref args, "", entries, null);
+    try {
+        Gtk.init_with_args(ref args, "", entries, null);
+    } catch (Error e) {
+        zavai.log.error("Cannot init gtk: " + e.message);
+        return 1;
+    }
     Gst.init (ref args);
 
     pidfilename = "zavai";
@@ -211,7 +220,7 @@ static int main (string[] args) {
        zavai.ui.main.init();
        zavai.ui.gps.init();
        zavai.ui.gsm.init();
-       zavai.config.run_script(zavai.config.homedir + "/display init");
+       zavai.config.find_and_run_script("display", "init");
        zavai.ui.power.init();
        zavai.ui.aux.init();
        zavai.ui.kbd.init();
@@ -268,6 +277,19 @@ static int main (string[] args) {
         zavai.clock.alarm_trigger_queue.enqueue_trigger(alarm);
     }
 
+    if (args.length > 2 && args[1] == "showlog")
+    {
+        string[] z = zavai.log.log.list_entries(false);
+        for (int i = 0; z[i] != null; ++i)
+            stderr.printf("FALSE %s\n", z[i]);
+        z = zavai.log.log.list_entries(true);
+        for (int i = 0; z[i] != null; ++i)
+            stderr.printf("TRUE %s\n", z[i]);
+        zavai.log.Log l = zavai.log.log.load(args[2]);
+        l.dump();
+        return 0;
+    }
+
        if (args.length > 2 && args[1] == "play")
     {
         zavai.audio.musicplayer.play("file://" + args[2]);