This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "krobot".
The branch, master has been updated
via 70a0dbab54eee22555b30b3f73c62a042e10289c (commit)
via bb40194d4aab57e09c461b717f5dc7157629856d (commit)
via 90290f3e7f9e4affaf0daf20657278993e4eb7b8 (commit)
from 1ef13ef11b4502205f9bc4b8f6a54af1375c274a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 70a0dbab54eee22555b30b3f73c62a042e10289c
Author: Jérémie Dimino <je...@di...>
Date: Wed Apr 13 13:58:16 2011 +0200
[krobot_service_planner] starts the service after registering the planner object to avoid a race condition
commit bb40194d4aab57e09c461b717f5dc7157629856d
Author: Jérémie Dimino <je...@di...>
Date: Wed Apr 13 13:56:14 2011 +0200
[krobot_service_planner] typo in the service file
commit 90290f3e7f9e4affaf0daf20657278993e4eb7b8
Author: Jérémie Dimino <je...@di...>
Date: Wed Apr 13 13:55:21 2011 +0200
[krobot_remote] use "ssh -C"
-----------------------------------------------------------------------
Changes:
diff --git a/info/control2011/src/services/fr.krobot.Service.Planner.service.ab b/info/control2011/src/services/fr.krobot.Service.Planner.service.ab
index 5fa58a5..13dc4d3 100644
--- a/info/control2011/src/services/fr.krobot.Service.Planner.service.ab
+++ b/info/control2011/src/services/fr.krobot.Service.Planner.service.ab
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=fr.krobot.Service.Planner
-Exec=$(bindir)/bin/krobot-service-planner
+Exec=$(bindir)/krobot-service-planner
diff --git a/info/control2011/src/services/krobot_service_planner.ml b/info/control2011/src/services/krobot_service_planner.ml
index f33d448..bed9a94 100644
--- a/info/control2011/src/services/krobot_service_planner.ml
+++ b/info/control2011/src/services/krobot_service_planner.ml
@@ -272,7 +272,6 @@ lwt () =
Arg.parse options ignore usage;
lwt bus = Krobot_bus.get () in
- lwt () = Krobot_service.init bus ~kill:!kill ~fork:!fork "Planner" in
(* Create a new planner. *)
let planner = create bus in
@@ -280,5 +279,8 @@ lwt () =
(* Export it on the krobot bus. *)
OBus_object.export (Krobot_bus.to_bus bus) planner.obus;
+ (* Start the service. *)
+ lwt () = Krobot_service.init bus ~kill:!kill ~fork:!fork "Planner" in
+
(* Wait forever. *)
fst (wait ())
diff --git a/info/control2011/src/tools/krobot_remote.ml b/info/control2011/src/tools/krobot_remote.ml
index f9ad3a6..ee2711e 100644
--- a/info/control2011/src/tools/krobot_remote.ml
+++ b/info/control2011/src/tools/krobot_remote.ml
@@ -17,7 +17,7 @@ let rec copy ta tb =
let handle_connection server ta =
ignore (
lwt () = Lwt_log.info "new connection" in
- let process = Lwt_process.open_process ("ssh", [|"ssh"; "krobot"; "/home/krobot/bin/krobot-local"|]) in
+ let process = Lwt_process.open_process ("ssh", [|"ssh"; "krobot"; "-C"; "/home/krobot/bin/krobot-local"|]) in
try_lwt
lwt _ = Lwt_io.read_char process#stdout in
let tb =
hooks/post-receive
--
krobot
|
