pywebexec 1.3.5__py3-none-any.whl → 1.3.7__py3-none-any.whl

pywebexec/pywebexec.py

@@ -222,7 +222,7 @@ def start_gunicorn(daemonized=False, baselog=None):
             sys.exit(1)
     else:
         errorlog = "-"
-        accesslog = "-"
+        accesslog = None #"-"
         pidfile = None
     options = {
         'bind': '%s:%s' % (args.listen, args.port),
@@ -439,6 +439,8 @@ def script(filename):
         return pty.spawn(shell, read)
 
 
+import fcntl
+
 def run_command(command, params, command_id, user):
     start_time = datetime.now().isoformat()
     update_command_status(command_id, 'running', command=command, params=params, start_time=start_time, user=user)
@@ -447,28 +449,33 @@ def run_command(command, params, command_id, user):
         with open(output_file_path, 'wb') as output_file:
             def read(fd):
                 data = os.read(fd, 1024)
+                if not data:  # Check for EOF
+                    raise OSError("EOF reached")
                 output_file.write(data)
                 output_file.flush()
                 return data
 
             def spawn_pty():
                 pid, fd = pty.fork()
-                if pid == 0: # children
+                if pid == 0:  # Child process
                     try:
                         os.setsid()
                     except:
                         pass
                     os.execvp(command, [command] + params)
-                else:
+                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:
-                        try:
-                            read(fd)
-                        except OSError:
-                            break
+                        r, _, _ = select.select([fd], [], [], 1.0)  # Use select to monitor the file descriptor
+                        if fd in r:
+                            try:
+                                read(fd)
+                            except OSError:
+                                break
                     (pid, status) = os.waitpid(pid, 0)
-                    print(status)
                     return status
+
             status = spawn_pty()
         end_time = datetime.now().isoformat()
         # Update the status based on the result
@@ -495,9 +502,12 @@ def stop_command(command_id):
     pid = status['pid']
     end_time = datetime.now().isoformat()
     try:
+        update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
         os.killpg(os.getpgid(pid), 15)  # Send SIGTERM to the process group
-        #os.waitpid(pid, 0)  # Wait for the process to terminate
-        #update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
+        try:
+            os.waitpid(pid, 0)  # Wait for the process to terminate
+        except ChildProcessError:
+            pass  # Ignore if the process has already been reaped
         return jsonify({'message': 'Command aborted'})
     except Exception as e:
         status_data = read_command_status(command_id) or {}

pywebexec/version.py

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

{pywebexec-1.3.5.dist-info → pywebexec-1.3.7.dist-info}/METADATA

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

{pywebexec-1.3.5.dist-info → pywebexec-1.3.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=zZRaHVUoWqX6IHCesfrboCjcjKGYnOq3jZpos7h9JEI,26333
-pywebexec/version.py,sha256=FcYWgM5oYgqvidiF8nHnDFf0uLGibSe_Bdaq7MY6S4U,411
+pywebexec/pywebexec.py,sha256=ks64NNrtgs1ivwiUVDD1At69_hDlaU6mT7YZ1ndHtCE,26832
+pywebexec/version.py,sha256=wi-wdjHlnbEGXkbINL3u9-DfMuMikQsUE4upTqz0SJE,411
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=iLX6k1hoWLinZWyqtbH50U-0hND2M-5_Zr1U1UC_gos,5578
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
@@ -20,9 +20,9 @@ pywebexec/static/js/xterm/xterm-addon-fit.js,sha256=Pprm9pZe4SadVXS5Bc8b9VnC9Ex4
 pywebexec/static/js/xterm/xterm.js,sha256=Bzka76jZwEhVt_LlS0e0qMw7ryGa1p5qfxFyeohphBo,283371
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=DYtT555wSNhnFtzzHhPMWJireynCJNnAuTytpoORQeE,2321
-pywebexec-1.3.5.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.3.5.dist-info/METADATA,sha256=rNB2fBP4AMqwoDaR9tE2yq3EDr1mKs6zW6neFJ87aRM,7397
-pywebexec-1.3.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.3.5.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.3.5.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.3.5.dist-info/RECORD,,
+pywebexec-1.3.7.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.3.7.dist-info/METADATA,sha256=zJ1dlHWVBDz4QgRQmpcJ3K-7j61TIIOufhJTSqcArW4,7397
+pywebexec-1.3.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.3.7.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.3.7.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.3.7.dist-info/RECORD,,