Merge lp:~kai-mast/friends/upstart into lp:friends

[Kai Mast]

Added an upstart script to friends. This will start the service on session start.

I also fixed some warnings in the build process.

[lp:~kai-mast/friends/upstart]

253. By Kai Mast on 2013-12-13

Try removing the makefile

254. By Kai Mast on 2013-12-13

Removed makefile.am

255. By Kai Mast on 2013-12-13

Deleted the correct file now

256. By Kai Mast on 2013-12-13

Fixed makefile.am

[Kai Mast (kai-mast)]

Sorry I screwed up the diff a little. Accidentally removed makefile.am instead of Makefile.

[Robert Bruce Park (robru)]

What's with the change to service.vala?

I think I'd like to see this resubmitted without any changes made under service/

review: Needs Resubmitting

[Kai Mast (kai-mast)]

There was a warning that a value was assigned and never used.

But maybe you're right and this should be done in a separate branch (there are many warnings when compiling the vala stuff).

[Robert Bruce Park (robru)]

Maybe this has changed recently but the last time I tried to fix that
warning, it just threw up another warning that we were ignoring the
return value from that function. Did you not see that warning when you
made that change? It's kind of a no-win situation and it's irrelevant
to the real change you want to make here.

[Kai Mast (kai-mast)]

Guess your right.

Btw, what is friends-dispatcher for. Is it enough to just start friends-service? Seems like friends-dispatcher gets started by friends-service after some time.

[Robert Bruce Park (robru)]

friends-dispatcher is the part that does all the work! ;-)

friends-service is just a simple timer that exists to invoke friends-dispatcher periodically. It used to be that friends-dispatcher was a long-running python process, but it was discovered that python's GObject implementation has incredibly poor memory usage characteristics compared to Vala, so in order to save memory we changed it so that there was a bare-minimum vala daemon that stays in memory and just invokes the python dispatcher to do all the work periodically, then exit.

[Kai Mast (kai-mast)]

So it does nothing else than executing friends-service every few minutes? Maybe it would make more sense to also use upstart for that then..

Upstart can also activate services via d-bus besides time-based events. Maybe that would make sense in this case.

[Robert Bruce Park (robru)]

Yeah, we thought of that, but unfortunately the -service also has to keep the data model in memory in order for things like the Friends Scope to be able to access that information on demand, and that's not something that upstart is capable of doing.

Unmerged revisions

256. By Kai Mast on 2013-12-13

Fixed makefile.am

255. By Kai Mast on 2013-12-13

Deleted the correct file now

254. By Kai Mast on 2013-12-13

Removed makefile.am

253. By Kai Mast on 2013-12-13

Try removing the makefile

252. By Kai Mast on 2013-12-13

Removed unneeded return value

251. By Kai Mast on 2013-12-13

* Fixed friends.install
* Removed linking to pthread

250. By Kai Mast on 2013-12-12

Now installing in the correct directory

249. By Kai Mast on 2013-12-12

First attempt to use upstart

=== added file 'data/friends.conf'
--- data/friends.conf	1970-01-01 00:00:00 +0000
+++ data/friends.conf	2013-12-13 20:53:24 +0000
@@ -0,0 +1,5 @@
+start on desktop-start
+stop on desktop-end
+
+exec friends-service
+

=== modified file 'debian/control'
--- debian/control	2013-11-07 14:54:31 +0000
+++ debian/control	2013-12-13 20:53:24 +0000
@@ -32,7 +32,7 @@
                valac,
                libdee-dev,
                dh-autoreconf,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: https://launchpad.net/friends
 # If you aren't a member of ~super-friends but need to upload packaging changes,
 # just go ahead.  ~super-friends will notice and sync up the code again.

=== modified file 'debian/friends.install'
--- debian/friends.install	2013-04-04 22:57:10 +0000
+++ debian/friends.install	2013-12-13 20:53:24 +0000
@@ -2,3 +2,4 @@
 usr/share/dbus-1/services/com.canonical.Friends.Service.service
 usr/share/friends/model-schema.csv
 usr/share/glib-2.0/schemas/com.canonical.friends.gschema.xml
+usr/share/upstart/sessions/friends.conf

=== added file 'service/Makefile.am'
--- service/Makefile.am	1970-01-01 00:00:00 +0000
+++ service/Makefile.am	2013-12-13 20:53:24 +0000
@@ -0,0 +1,4 @@
+SUBDIRS = src data
+
+dist_noinst_SCRIPTS = \
+ autogen.sh

=== removed file 'service/Makefile.am'
--- service/Makefile.am	2013-02-04 19:42:37 +0000
+++ service/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-SUBDIRS = src data
-
-dist_noinst_SCRIPTS = \
-	autogen.sh

=== modified file 'service/src/service.vala'
--- service/src/service.vala	2013-11-05 18:51:48 +0000
+++ service/src/service.vala	2013-12-13 20:53:24 +0000
@@ -183,7 +183,7 @@
         try {
             dispatcher = Bus.get_proxy.end(res);
             // Timeout.add_seconds (120, fetch_contacts); // LP#1214639
-            var ret = on_refresh ();
+            on_refresh ();
         } catch (IOError e) {
             warning (e.message);
         }

=== modified file 'setup.py'
--- setup.py	2013-04-04 22:57:10 +0000
+++ setup.py	2013-12-13 20:53:24 +0000
@@ -36,6 +36,8 @@
          ['data/com.canonical.friends.gschema.xml']),
         ('/usr/share/friends',
          ['data/model-schema.csv']),
+        ('/usr/share/upstart/sessions',
+         ['data/friends.conf'])
         ],
     entry_points = {
         'console_scripts': ['friends-dispatcher = friends.main:main'],