pywebexec 0.0.7__tar.gz → 0.0.8__tar.gz

{pywebexec-0.0.7/pywebexec.egg-info → pywebexec-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 0.0.7
+Version: 0.0.8
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -53,6 +53,7 @@ Classifier: Topic :: System :: Systems Administration
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-daemon>=2.3.2
 Requires-Dist: cryptography>=40.0.2
 Requires-Dist: Flask>=3.0.3
 Requires-Dist: Flask-HTTPAuth>=4.8.0
@@ -127,5 +128,5 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in current directory `.web_status/pwexec_<listen>:<port>.log`
+* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 

{pywebexec-0.0.7 → pywebexec-0.0.8}/README.md

@@ -68,5 +68,5 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in current directory `.web_status/pwexec_<listen>:<port>.log`
+* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 

{pywebexec-0.0.7 → pywebexec-0.0.8}/pyproject.toml

@@ -9,6 +9,7 @@ maintainers = [
 
 description = "Simple Python HTTP Exec Server"
 dependencies = [
+  "python-daemon>=2.3.2",
   "cryptography>=40.0.2",
   "Flask>=3.0.3",
   "Flask-HTTPAuth>=4.8.0",

{pywebexec-0.0.7 → pywebexec-0.0.8}/pywebexec/pywebexec.py

@@ -1,3 +1,4 @@
+import sys
 from flask import Flask, request, jsonify, render_template
 from flask_httpauth import HTTPBasicAuth
 import subprocess
@@ -10,13 +11,17 @@ import random
 import string
 from datetime import datetime
 import shlex
-from gunicorn.app.base import BaseApplication
+from gunicorn.app.base import BaseApplication, Application
 
 app = Flask(__name__)
 auth = HTTPBasicAuth()
 
 # Directory to store the script status and output
 SCRIPT_STATUS_DIR = '.web_status'
+CONFDIR = os.path.expanduser("~/")
+if os.path.isdir(f"{CONFDIR}/.config"):
+    CONFDIR += '/.config'
+CONFDIR += "/.pywebexec"
 
 if not os.path.exists(SCRIPT_STATUS_DIR):
     os.makedirs(SCRIPT_STATUS_DIR)
@@ -25,7 +30,7 @@ def generate_random_password(length=12):
     characters = string.ascii_letters + string.digits + string.punctuation
     return ''.join(random.choice(characters) for i in range(length))
 
-class StandaloneApplication(BaseApplication):
+class StandaloneApplication(Application):
 
     def __init__(self, app, options=None):
         self.options = options or {}
@@ -44,13 +49,25 @@ class StandaloneApplication(BaseApplication):
         return self.application
 
 
-def start_gunicorn():
+def start_gunicorn(daemon=False, baselog=None):
+    if daemon:
+        errorlog = f"{baselog}.log"
+        accesslog = None # f"{baselog}.access.log"
+        pidfile = f"{baselog}.pid"
+    else:
+        errorlog = "-"
+        accesslog = "-"
+        pidfile = None
     options = {
         'bind': '%s:%s' % (args.listen, args.port),
         'workers': 4,
         'timeout': 600,
         'certfile': args.cert,
         'keyfile': args.key,
+        'daemon': daemon,
+        'errorlog': errorlog,
+        'accesslog': accesslog,
+        'pidfile': pidfile,
     }
     StandaloneApplication(app, options=options).run()
 
@@ -86,7 +103,10 @@ def daemon_d(action, pidfilepath, hostname=None, args=None):
             working_directory=os.getcwd(),
         )
         with daemon_context:
-            start_gunicorn()
+            try:
+                start_gunicorn()
+            except Exception as e:
+                print(e)
 
 def parseargs():
     global app, args
@@ -114,6 +134,15 @@ def parseargs():
     parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status", choices=["start","stop","restart","status"])
 
     args = parser.parse_args()
+    if os.path.isdir(args.dir):
+        try:
+            os.chdir(args.dir)
+        except OSError:
+            print(f"Error: cannot chdir {args.dir}", file=sys.stderr)
+            sys.exit(1)
+    else:
+        print(f"Error: {args.dir} not found", file=sys.stderr)
+        sys.exit(1)
 
     if args.user:
         app.config['USER'] = args.user
@@ -317,10 +346,14 @@ def verify_password(username, password):
     return username == app.config['USER'] and password == app.config['PASSWORD']
 
 def main():
+    basef = f"{CONFDIR}/pywebexec_{args.listen}:{args.port}"
+    if not os.path.exists(CONFDIR):
+        os.mkdir(CONFDIR, mode=0o700)
+    if args.action == "start":
+        return start_gunicorn(daemon=True, baselog=basef)
     if args.action:
-        daemon_d(args.action, pidfilepath=SCRIPT_STATUS_DIR+'/pywebexec')
-    else:
-        start_gunicorn()
+        return daemon_d(args.action, pidfilepath=basef)
+    return start_gunicorn()
 
 if __name__ == '__main__':
     main()

{pywebexec-0.0.7 → pywebexec-0.0.8}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.7'
-__version_tuple__ = version_tuple = (0, 0, 7)
+__version__ = version = '0.0.8'
+__version_tuple__ = version_tuple = (0, 0, 8)

{pywebexec-0.0.7 → pywebexec-0.0.8/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 0.0.7
+Version: 0.0.8
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -53,6 +53,7 @@ Classifier: Topic :: System :: Systems Administration
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-daemon>=2.3.2
 Requires-Dist: cryptography>=40.0.2
 Requires-Dist: Flask>=3.0.3
 Requires-Dist: Flask-HTTPAuth>=4.8.0
@@ -127,5 +128,5 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in current directory `.web_status/pwexec_<listen>:<port>.log`
+* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 

{pywebexec-0.0.7 → pywebexec-0.0.8}/pywebexec.egg-info/requires.txt

@@ -1,3 +1,4 @@
+python-daemon>=2.3.2
 cryptography>=40.0.2
 Flask>=3.0.3
 Flask-HTTPAuth>=4.8.0