Add a 'current_port' traitlet instead of modifying self.port

Author: cmd-ntrf

batchspawner/api.py

@@ -8,9 +8,8 @@ def post(self):
         """POST set user's spawner port number"""
         user = self.get_current_user()
         data = self.get_json_body()
-        if user.spawner.port == 0:
-            port = data.get('port', 0)
-            user.spawner.port = int(port)
+        port = int(data.get('port', 0))
+        user.spawner.current_port = port
         self.finish(json.dumps({"message": "BatchSpawner port configured"}))
         self.set_status(201)
 

batchspawner/batchspawner.py

@@ -168,6 +168,9 @@ def _req_keepvars_default(self):
     # Will get the address of the server as reported by job manager
     current_ip = Unicode()
 
+    # Will get the port of the server as reported by singleserver
+    current_port = Integer()
+
     # Prepare substitution variables for templates using req_xyz traits
     def get_req_subvars(self):
         reqlist = [ t for t in self.trait_names() if t.startswith('req_') ]
@@ -346,7 +349,9 @@ def poll(self):
     @gen.coroutine
     def start(self):
         """Start the process"""
-        self.port = self.server.port = 0
+        if self.server:
+            self.server.port = self.port
+
         job = yield self.submit_batch_script()
 
         # We are called with a timeout, and if the timeout expires this function will
@@ -371,19 +376,19 @@ def start(self):
             yield gen.sleep(self.startup_poll_interval)
 
         self.current_ip = self.state_gethost()
-        while self.port == 0:
+        while self.current_port == 0:
             yield gen.sleep(self.startup_poll_interval)
 
         if jupyterhub.version_info < (0,7):
             # store on user for pre-jupyterhub-0.7:
-            self.user.server.port = self.port
+            self.user.server.port = self.current_port
             self.user.server.ip = self.current_ip
         self.db.commit()
         self.log.info("Notebook server job {0} started at {1}:{2}".format(
-                        self.job_id, self.current_ip, self.port)
+                        self.job_id, self.current_ip, self.current_port)
             )
 
-        return self.current_ip, self.port
+        return self.current_ip, self.current_port
 
     @gen.coroutine
     def stop(self, now=False):

batchspawner/tests/test_spawners.py

@@ -17,6 +17,7 @@
 
 testhost = "userhost123"
 testjob  = "12345"
+testport = 54321
 
 class BatchDummy(BatchSpawnerRegexStates):
     exec_prefix = ''
@@ -61,6 +62,7 @@ def new_spawner(db, spawner_class=BatchDummy, **kwargs):
         user = User(user, {})
     kwargs.setdefault('hub', hub)
     kwargs.setdefault('user', user)
+    kwargs.setdefault('current_port', testport)
     kwargs.setdefault('INTERRUPT_TIMEOUT', 1)
     kwargs.setdefault('TERM_TIMEOUT', 1)
     kwargs.setdefault('KILL_TIMEOUT', 1)