[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.5-48-g838bdf9

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:23 CEST 2013


The branch, build-main has been updated
       via  838bdf9fccfd43bae4b23ccc141d75fccaeaa7de (commit)
      from  e468013decdfd46a467b5dc7f66757f5a91fdd1b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 sbin/x2gobroker                   |    3 ++-
 x2gobroker/brokers/base_broker.py |   14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/sbin/x2gobroker b/sbin/x2gobroker
index 04e379c..fb6d052 100755
--- a/sbin/x2gobroker
+++ b/sbin/x2gobroker
@@ -26,6 +26,7 @@ import sys
 import argparse
 import socket
 import logging
+import thread
 import web
 from web.wsgiserver import CherryPyWSGIServer
 
@@ -130,6 +131,6 @@ application = app.wsgifunc()
 # run the web.py standalone daemon...
 if __name__ == "__main__":
     try:
-        app.run()
+        thread.start_new_thread(app.run(), ())
     except socket.error, e:
         print (e)
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index a19f6d9..6062815 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -871,13 +871,13 @@ class X2GoBroker(object):
             selected_session.update({
                 'authentication_privkey': privkey,
             })
-            x2gobroker.agent.delete_authorized_key(username=username,
-                                                   pubkey_hash=pubkey,
-                                                   authorized_keys_file=self.get_authorized_keys_file(profile_id),
-                                                   query_mode=agent_query_mode,
-                                                   remote_agent=remote_agent,
-                                                   delay_deletion=60,
-            ),
+            #x2gobroker.agent.delete_authorized_key(username=username,
+            #                                       pubkey_hash=pubkey,
+            #                                       authorized_keys_file=self.get_authorized_keys_file(profile_id),
+            #                                       query_mode=agent_query_mode,
+            #                                       remote_agent=remote_agent,
+            #                                       delay_deletion=60,
+            #),
 
         return selected_session
 


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).




More information about the x2go-commits mailing list