pywebexec 1.3.7__tar.gz → 1.3.8__tar.gz

{pywebexec-1.3.7/pywebexec.egg-info → pywebexec-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.3.7
+Version: 1.3.8
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-1.3.7 → pywebexec-1.3.8}/pywebexec/pywebexec.py

@@ -437,9 +437,7 @@ def script(filename):
             s.flush()
             return data
         return pty.spawn(shell, read)
-
-
-import fcntl
+        
 
 def run_command(command, params, command_id, user):
     start_time = datetime.now().isoformat()
@@ -465,26 +463,24 @@ def run_command(command, params, command_id, user):
                     os.execvp(command, [command] + params)
                 else:  # Parent process
                     update_command_status(command_id, 'running', pid=pid, user=user)
-                    fcntl.fcntl(fd, fcntl.F_SETFL, os.O_NONBLOCK)  # Set the file descriptor to non-blocking mode
                     while True:
-                        r, _, _ = select.select([fd], [], [], 1.0)  # Use select to monitor the file descriptor
-                        if fd in r:
-                            try:
-                                read(fd)
-                            except OSError:
-                                break
+                        try:
+                            read(fd)
+                        except OSError:
+                            break
                     (pid, status) = os.waitpid(pid, 0)
                     return status
 
             status = spawn_pty()
         end_time = datetime.now().isoformat()
         # Update the status based on the result
-        if os.WIFEXITED(status):
+        if os.WIFSIGNALED(status):
+            exit_code = -os.WTERMSIG(status)
+            update_command_status(command_id, 'aborted', end_time=end_time, exit_code=exit_code, user=user)
+        else:
             exit_code = os.WEXITSTATUS(status)
             if exit_code == 0:
                 update_command_status(command_id, 'success', end_time=end_time, exit_code=exit_code, user=user)
-            elif exit_code == -15:
-                update_command_status(command_id, 'aborted', end_time=end_time, exit_code=exit_code, user=user)
             else:
                 update_command_status(command_id, 'failed', end_time=end_time, exit_code=exit_code, user=user)
     except Exception as e:

{pywebexec-1.3.7 → pywebexec-1.3.8}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.7'
-__version_tuple__ = version_tuple = (1, 3, 7)
+__version__ = version = '1.3.8'
+__version_tuple__ = version_tuple = (1, 3, 8)

{pywebexec-1.3.7 → pywebexec-1.3.8/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.3.7
+Version: 1.3.8
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau