From: Arvin Schnell <aschnell@suse.de>
Date: Fri, 3 Aug 2012 07:43:18 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5159cb2e3c1419c3ade08dbebdf09d563497caa5;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/server/Client.cc b/server/Client.cc
index 481882d2..0ee339ed 100644
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -391,7 +391,7 @@ Client::signal_config_deleted(DBus::Connection& conn, const string& config_name)
 
 void
 Client::signal_snapshot_created(DBus::Connection& conn, const string& config_name,
-				  unsigned int num)
+				unsigned int num)
 {
     DBus::MessageSignal msg(PATH, INTERFACE, "SnapshotCreated");
 
@@ -404,7 +404,7 @@ Client::signal_snapshot_created(DBus::Connection& conn, const string& config_nam
 
 void
 Client::signal_snapshots_deleted(DBus::Connection& conn, const string& config_name,
-				   list<dbus_uint32_t> nums)
+				 const list<dbus_uint32_t>& nums)
 {
     DBus::MessageSignal msg(PATH, INTERFACE, "SnapshotsDeleted");
 
diff --git a/server/Client.h b/server/Client.h
index c906984f..9715b22a 100644
--- a/server/Client.h
+++ b/server/Client.h
@@ -77,7 +77,7 @@ public:
     void signal_snapshot_created(DBus::Connection& conn, const string& config_name,
 				 unsigned int num);
     void signal_snapshots_deleted(DBus::Connection& conn, const string& config_name,
-				  list<dbus_uint32_t> nums);
+				  const list<dbus_uint32_t>& nums);
 
     void list_configs(DBus::Connection& conn, DBus::Message& msg);
     void get_config(DBus::Connection& conn, DBus::Message& msg);
diff --git a/server/snapperd.cc b/server/snapperd.cc
index b1ab6eb9..a8ce2506 100644
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -35,6 +35,10 @@
 using namespace std;
 
 
+const int idle_time = 60;
+const int snapper_cleanup_time = 30;
+
+
 class MyMainLoop : public DBus::MainLoop
 {
 public:
@@ -141,11 +145,11 @@ MyMainLoop::periodic()
     clients.remove_zombies();
 
     if (clients.empty())
-	set_idle_timeout(30);
+	set_idle_timeout(idle_time);
 
     for (MetaSnappers::iterator it = meta_snappers.begin(); it != meta_snappers.end(); ++it)
     {
-	if (it->is_loaded() && it->unused_for() > 10)
+	if (it->is_loaded() && it->unused_for() > snapper_cleanup_time)
 	    it->unload();
     }
 }
@@ -197,7 +201,7 @@ main(int argc, char** argv)
 
     MyMainLoop mainloop(DBUS_BUS_SYSTEM);
 
-    mainloop.set_idle_timeout(30);
+    mainloop.set_idle_timeout(idle_time);
 
     y2mil("Requesting DBus name");