Merge branch 'dev' into 'test'

Dev

See merge request !96

.gitlab-ci.yml

@@ -84,7 +84,7 @@ deploy_prod:
     - docker ps -a -q | xargs -I{} docker rm  {} || echo "No containers to remove"
     - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
     - docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
-    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always  -d -p 8080:8080 -p 8090:8090 --log-driver json-file --log-opt max-size=10m --log-opt max-file=3 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
+    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 -v /home/ubuntu/telegraf.conf:/etc/telegraf/telegraf.conf:ro --restart=always  -d -p 8080:8080 -p 8090:8090 --log-driver json-file --log-opt max-size=10m --log-opt max-file=3 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
   dependencies:
     - build
     

runscript

@@ -9,6 +9,7 @@ uwsgi \
         --gid=www-data \
         --stats /tmp/statsock \
         --memory-report \
+        --listen=512 \
         -w tes.tes_wsgi &
 telegraf &
 twsproxy 8090 

tes/sshwrapper/__init__.py

@@ -98,8 +98,11 @@ class Ssh:
     @staticmethod
     def check_ctrlsocket(sess, ctrlsocket):
         cmd = ['ssh','-S',ctrlsocket,'-O','check','-l','noone','nohost']
-        check_p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,stdin=None)
-        (stderr,stdout) = check_p.communicate(timeout=Ssh.TIMEOUT)
+        try:
+            check_p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,stdin=None)
+            (stderr,stdout) = check_p.communicate(timeout=Ssh.TIMEOUT)
+        except subprocess.TimeoutExpired as e:
+            raise e
         return check_p.returncode == 0
 
     @staticmethod
@@ -113,11 +116,16 @@ class Ssh:
         import logging
         logger = logging.getLogger()
         logger.debug("enter get_ctrl_master_socket")
-        sess.lock.acquire()
         ctrlsocket = "/tmp/cm-{}-{}-{}".format(user,host,sess.sshsessid)
-        if Ssh.check_ctrlsocket(sess,ctrlsocket):
+        sess.lock.acquire()
+        try:
+            if Ssh.check_ctrlsocket(sess,ctrlsocket):
+                sess.lock.release()
+                return ctrlsocket
+        except subprocess.TimeoutExpired as e:
             sess.lock.release()
-            return ctrlsocket
+            raise e
+
         try:
             mode = os.stat(ctrlsocket).st_mode
             logger.debug('removing stale control socket')
@@ -126,25 +134,29 @@ class Ssh:
         except FileNotFoundError as e:
             pass
 
-        sshcmd = Ssh.SSHCMDWITHOPTS.copy()
-        sshcmd.extend([
-                  "-S", ctrlsocket,
-                  "-M", '-o', 'ControlPersist=60s',
-                  '-p', sshport, '-N','-l', user, host])
-        env = os.environ.copy()
-        if sess.socket is None:
+        try:
+            sshcmd = Ssh.SSHCMDWITHOPTS.copy()
+            sshcmd.extend([
+                    "-S", ctrlsocket,
+                    "-M", '-o', 'ControlPersist=60s',
+                    '-p', sshport, '-N','-l', user, host])
+            env = os.environ.copy()
+            if sess.socket is None:
+                sess.lock.release()
+                logger.debug("Exception get_ctrl_master_socket")
+                raise SshAgentException("No ssh-agent yet")
+            env['SSH_AUTH_SOCK'] = sess.socket
+            logger.debug("creating master socket")
+            logger.debug("ssh_auth_sock {}".format(sess.socket))
+            logger.debug(" ".join(sshcmd))
+            ctrl_p = subprocess.Popen(sshcmd,
+                                    stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                    stdin=None,
+                                    env=env)
+            (stderr,stdout) = ctrl_p.communicate() # The process should exit, while the mux persists
+        except Exception as e:
             sess.lock.release()
-            logger.debug("Exception get_ctrl_master_socket")
-            raise SshAgentException("No ssh-agent yet")
-        env['SSH_AUTH_SOCK'] = sess.socket
-        logger.debug("creating master socket")
-        logger.debug("ssh_auth_sock {}".format(sess.socket))
-        logger.debug(" ".join(sshcmd))
-        ctrl_p = subprocess.Popen(sshcmd,
-                                  stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                                  stdin=None,
-                                  env=env)
-        (stderr,stdout) = ctrl_p.communicate() # The process should exit, while the mux persists
+            raise e
         if ctrl_p.returncode == 0:
             sess.lock.release()
             return ctrlsocket

tes/tunnelstat/__init__.py

@@ -64,8 +64,12 @@ class SSHSession:
         import logging
         logger = logging.getLogger()
         self.lock.acquire()
-        if self.socket is None:
-            self.start_agent()
+        try:
+            if self.socket is None:
+                self.start_agent()
+        except Exception as e:
+            self.lock.release()
+            raise e
         self.lock.release()
         keyf = tempfile.NamedTemporaryFile(mode='w',delete=False)
         keyname = keyf.name
@@ -206,8 +210,12 @@ class SSHSession:
         logger=logging.getLogger()
         env = os.environ.copy()
         sess.lock.acquire()
-        if sess.socket is None:
-            sess.start_agent()
+        try:
+            if sess.socket is None:
+                sess.start_agent()
+        except Exception as e:  
+            sess.lock.release()
+            raise e
         sess.lock.release()
         env['SSH_AUTH_SOCK'] = sess.socket
         cmd = [sess.sshadd,'-l']