Ernesto Menéndez avatar Ernesto Menéndez committed 937eb94

backout de creacion de branch erroneo 'jujorugo'

Comments (0)

Files changed (2)

             },
             "sessions" : {
                 "db" : 1,
-                "ttl" : 300000
+                "ttl" : 300
             }
         }
     },
     "apps" : {
         "cman" : {
-            "host" : "192.168.2.4",
+            "host" : "0.0.0.0",
             "port" : 23601,
             "pyramid_configurator_settings" : {
                 "mako.directories" : "nxweb.assets:templates",
             }
         },
         "cmanws" : {
-            "host" : "192.168.2.4",
+            "host" : "0.0.0.0",
             "port" : 23602
         },
         "auth" : {
-            "host" : "192.168.2.4",
+            "host" : "0.0.0.0",
             "port" : 23603,
             "pyramid_configurator_settings" : {
                 "mako.directories" : "nxweb.assets:templates",
             }
         },
         "admin" : {
-            "host" : "192.168.2.4",
+            "host" : "0.0.0.0",
             "port" : 23604,
             "pyramid_configurator_settings" : {
                 "auth_policy_secret" : "something secret",
             }
         },
         "wman" : {
-            "host" : "192.168.2.4",
+            "host" : "0.0.0.0",
             "port" : 23605,
             "pyramid_configurator_settings" : {
                 "auth_policy_secret" : "something secret"
             }
         },
         "wmanws" : {
-            "host" : "192.168.2.4",
+            "host" : "0.0.0.0",
             "port" : 23606
         },
         "daac" : {
-            "host" : "192.168.2.4",
+            "host" : "0.0.0.0",
             "port" : 23607,
             "pyramid_configurator_settings" : {
                 "auth_policy_secret" : "something secret"

nxweb/apps/wmanws/__init__.py

             try:
                 message = websocket.receive()
             except:
-                message = None
+                raise WorkerCommunicationError()
 
             if message is None:
                 debug("##connection closed by the worker")
     def task_short_print(self, task_comp_key):
         pubkey_key, task_key = task_comp_key.split("+")
         task_metadata = task_dkvs.get_metadata(task_comp_key)
-        if task_metadata is None:
-            return ""
+
+
         task = task_metadata['program_key'].split("+")
         task.append(repr(task_metadata['counter']))
         #[user] [program_name] [task_number]
         try:
             self.websocket.close()
         except:
-            pass
+            raise WorkerCommunicationError()
 
     def get_unfinished_tasks(self):
         return self.assigned_tasks
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.