[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-118-g538a0e8

[X2Go dev team]

The branch, master has been updated
       via  538a0e8003c67a29f6fcd179909fbcf0e648da15 (commit)
      from  7ac89900fc8f98bc94c1651e520f8003b2f559a8 (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 538a0e8003c67a29f6fcd179909fbcf0e648da15
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 19 22:22:53 2013 +0100

    improve daemonizing code in x2gobroker

-----------------------------------------------------------------------

Summary of changes:
 bin/x2gobroker |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index 35ed455..8e4c5bf 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -181,7 +181,7 @@ if __name__ == "__main__":
         if cmdline_args.task:        logger_broker.warn('ignoring non-valid option --task for broker mode HTTP...')
         if cmdline_args.profile_id:  logger_broker.warn('ignoring non-valid option --profile-id for broker mode HTTP...')
 
-        if cmdline_args.daemonize:
+        if CAN_DAEMONIZE and cmdline_args.daemonize:
             pidfile = os.path.expanduser(cmdline_args.pidfile)
             if not os.path.isdir(os.path.dirname(pidfile)):
                 try:
@@ -250,7 +250,7 @@ if __name__ == "__main__":
                 http_server = tornado.httpserver.HTTPServer(application)
             http_server.listen(bind_port, address=bind_address)
 
-            if cmdline_args.daemonize:
+            if CAN_DAEMONIZE and cmdline_args.daemonize:
                 keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ]
                 daemon = daemonize.Daemonize(app="x2gobroker", pid=pidfile, action=launch_ioloop, keep_fds=keep_fds)
                 daemon.start()


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).