remote-run-everything 2.0.8__tar.gz → 2.0.9__tar.gz

{remote_run_everything-2.0.8/remote_run_everything.egg-info → remote_run_everything-2.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remote_run_everything
-Version: 2.0.8
+Version: 2.0.9
 Summary: Deploy Tools
 Author-email: Wang Qi <wangmarkqi@gmail.com>
 License-Expression: MIT
@@ -99,22 +99,8 @@ q = {"a": 2,"b":{"$gt":1}}
 print(col.find(q))
 db.drop_db()
 ```
-## 进程管理
-```python
-import os
-class ProcessManage:
-    # nosql is instance of Nosql or Nosqlmysql or Nqsqlpg
-    def __init__(self, nosql):
-        self.db = nosql
-        self.col = self.db['pid']
 
-    # 只需要在程序中引入这个函数,启动后会把pid存入数据库,然后有了pid,结合psutil,什么都有了
-    def save_pid(self, name, cmd):
-        dic = {"name": name, "cmd": cmd, "pid": os.getpid()}
-        print("save pid", dic)
-        self.col.insert_one(dic)
 
-```
 ##  缓存装饰器
 ```python
 from remote_run_everything import cache_by_1starg,cache_by_name,cache_by_rkey,cache_by_nth_arg

{remote_run_everything-2.0.8 → remote_run_everything-2.0.9}/README.md

@@ -84,22 +84,8 @@ q = {"a": 2,"b":{"$gt":1}}
 print(col.find(q))
 db.drop_db()
 ```
-## 进程管理
-```python
-import os
-class ProcessManage:
-    # nosql is instance of Nosql or Nosqlmysql or Nqsqlpg
-    def __init__(self, nosql):
-        self.db = nosql
-        self.col = self.db['pid']
 
-    # 只需要在程序中引入这个函数,启动后会把pid存入数据库,然后有了pid,结合psutil,什么都有了
-    def save_pid(self, name, cmd):
-        dic = {"name": name, "cmd": cmd, "pid": os.getpid()}
-        print("save pid", dic)
-        self.col.insert_one(dic)
 
-```
 ##  缓存装饰器
 ```python
 from remote_run_everything import cache_by_1starg,cache_by_name,cache_by_rkey,cache_by_nth_arg

{remote_run_everything-2.0.8 → remote_run_everything-2.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "remote_run_everything"
-version = "2.0.8"
+version = "2.0.9"
 authors = [
   { name="Wang Qi", email="wangmarkqi@gmail.com" },
 ]

{remote_run_everything-2.0.8 → remote_run_everything-2.0.9}/remote_run_everything/__init__.py

@@ -1,5 +1,6 @@
 from remote_run_everything.deploy.by_http import ByHttp
 from remote_run_everything.deploy.by_sftp import BySftp
+from remote_run_everything.deploy.process_manage import ProcessManage
 
 from remote_run_everything.db.crude_duck import CrudeDuck
 from remote_run_everything.db.crud_sqlalchemy import Crud

remote_run_everything-2.0.9/remote_run_everything/deploy/process_manage.py

@@ -0,0 +1,46 @@
+import os, signal
+import subprocess, sys
+class ProcessManage:
+    def is_process_running(self,pid):
+        import psutil
+        try:
+            process = psutil.Process(pid)
+            # Check if process is still running
+            return process.is_running()
+        except psutil.NoSuchProcess:
+            return False
+        except psutil.AccessDenied:
+            # Process exists but we don't have permission to access it
+            print(f"Access denied to process {pid}")
+            return True
+    def read_pid_file(self,pidfile):
+        if os.path.exists(pidfile):
+            with open(pidfile, "rb") as f:
+                pid = f.read().decode()
+                return pid
+        return None
+
+    # 只需要在程序中引入这个函数,启动后会把 os.getpid()存入,然后有了pid,结合psutil,什么都有了
+    def write_pid_file(self,pidfile,pid):
+        with open(pidfile, "wb") as f:
+            s = str(pid).encode()
+            f.write(s)
+
+    def kill_by_pid(self,pid):
+        try:
+            os.kill(int(pid), signal.SIGTERM)
+        except Exception as e:
+            print("kill err==", e)
+
+    def popen_with_pid(self, workdir,  app):
+        os.chdir(workdir)
+        process = subprocess.Popen(app, creationflags=subprocess.CREATE_NEW_CONSOLE)
+        pid= process.pid
+        print("new pid====",pid)
+        return pid
+        # sys.exit()
+
+    def restart_windows(self):
+        os.system("shutdown -t 0 -r -f")
+
+

remote_run_everything-2.0.8/remote_run_everything/tools/common1.py → remote_run_everything-2.0.9/remote_run_everything/tools/common.py

@@ -1,8 +1,25 @@
+import socket, os, tomllib
+from remote_run_everything.tools.common1 import Common1
 import pandas as pd
 import jinja2, os,base64,struct, glob, arrow, uuid, hashlib
 
-
-class Common1:
+class Common(Common1):
+    @property
+    def local_ip(self):
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.connect(("8.8.8.8", 80))
+        ip = s.getsockname()[0]
+        s.close()
+        return ip
+
+    def read_conf(self, path=None):
+        if path is None:
+            d = "D://mypy/conf" if os.name == 'nt' else "/data/mypy/conf"
+            n = "win" if os.name == "nt" else self.local_ip
+            path = f"{d}/{n}.toml"
+        with open(path, "rb") as f:
+            data = tomllib.load(f)
+        return data
 
     def table_search(self, data, search):
         res = []
@@ -83,19 +100,6 @@ class Common1:
         zeros = "".join(l)
         return f"{zeros}{d}"
 
-    def clear_by_days(self, root, n):
-        files = glob.glob(f"{root}/*/*.*", recursive=True)
-        now = arrow.now()
-        for f in files:
-            info = os.stat(f).st_mtime
-            dif = now - arrow.get(info)
-            if dif.days > n:
-                os.remove(f)
-
-    def str2uuid(self, s):
-        hex_string = hashlib.md5(s.encode("UTF-8")).hexdigest()
-        return str(uuid.UUID(hex=hex_string))
-
     def ascii2hex(self,l):
         tu = [i.replace("0x", "") for i in l]
         tu = [self.prefix_zero(2, i) for i in tu]
@@ -114,10 +118,6 @@ class Common1:
             return struct.unpack('>f', bytes.fromhex(s))[0]
         return struct.unpack('<f', bytes.fromhex(s))[0]
 
-
-
-
-
 if __name__ == '__main__':
-    g = Common1()
+    g = Common()
     a = g.prefix_zero(5, 111)

remote_run_everything-2.0.9/remote_run_everything/tools/common1.py

@@ -0,0 +1,25 @@
+import jinja2, os,base64,struct, glob, arrow, uuid, hashlib
+
+
+class Common1:
+
+    def clear_by_days(self, root, n):
+        files = glob.glob(f"{root}/*/*.*", recursive=True)
+        now = arrow.now()
+        for f in files:
+            info = os.stat(f).st_mtime
+            dif = now - arrow.get(info)
+            if dif.days > n:
+                os.remove(f)
+
+    def str2uuid(self, s):
+        hex_string = hashlib.md5(s.encode("UTF-8")).hexdigest()
+        return str(uuid.UUID(hex=hex_string))
+
+
+
+
+
+
+if __name__ == '__main__':
+    g = Common1()

{remote_run_everything-2.0.8 → remote_run_everything-2.0.9/remote_run_everything.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remote_run_everything
-Version: 2.0.8
+Version: 2.0.9
 Summary: Deploy Tools
 Author-email: Wang Qi <wangmarkqi@gmail.com>
 License-Expression: MIT
@@ -99,22 +99,8 @@ q = {"a": 2,"b":{"$gt":1}}
 print(col.find(q))
 db.drop_db()
 ```
-## 进程管理
-```python
-import os
-class ProcessManage:
-    # nosql is instance of Nosql or Nosqlmysql or Nqsqlpg
-    def __init__(self, nosql):
-        self.db = nosql
-        self.col = self.db['pid']
 
-    # 只需要在程序中引入这个函数,启动后会把pid存入数据库,然后有了pid,结合psutil,什么都有了
-    def save_pid(self, name, cmd):
-        dic = {"name": name, "cmd": cmd, "pid": os.getpid()}
-        print("save pid", dic)
-        self.col.insert_one(dic)
 
-```
 ##  缓存装饰器
 ```python
 from remote_run_everything import cache_by_1starg,cache_by_name,cache_by_rkey,cache_by_nth_arg

{remote_run_everything-2.0.8 → remote_run_everything-2.0.9}/remote_run_everything.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ remote_run_everything/deploy/__init__.py
 remote_run_everything/deploy/by_http.py
 remote_run_everything/deploy/by_http_tool.py
 remote_run_everything/deploy/by_sftp.py
+remote_run_everything/deploy/process_manage.py
 remote_run_everything/deploy/record_mod.py
 remote_run_everything/nosql/__init__.py
 remote_run_everything/nosql/no_sql.py

remote_run_everything-2.0.8/remote_run_everything/tools/common.py

@@ -1,56 +0,0 @@
-import jinja2, requests, os
-import pandas as pd
-import socket, os, tomllib
-import base64
-import os, signal
-import subprocess, sys
-from remote_run_everything.tools.common1 import Common1
-
-
-class Common(Common1):
-    @property
-    def local_ip(self):
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.connect(("8.8.8.8", 80))
-        ip = s.getsockname()[0]
-        s.close()
-        return ip
-
-    def read_conf(self, path=None):
-        if path is None:
-            d = "D://mypy/conf" if os.name == 'nt' else "/data/mypy/conf"
-            n = "win" if os.name == "nt" else self.local_ip
-            path = f"{d}/{n}.toml"
-        with open(path, "rb") as f:
-            data = tomllib.load(f)
-        return data
-
-    def kill_by_pidfile(self, pidfile):
-        if os.path.exists(pidfile):
-            with open(pidfile, "rb") as f:
-                pid = f.read().decode()
-            print("exist pid===", pid)
-        try:
-            os.kill(int(pid), signal.SIGTERM)
-        except Exception as e:
-            print("kill err==", e)
-
-    def start_with_pidfile(self, workdir, pidfile, app):
-        os.chdir(workdir)
-        process = subprocess.Popen(app, creationflags=subprocess.CREATE_NEW_CONSOLE)
-        print("new pid====", process.pid)
-        with open(pidfile, "wb") as f:
-            s = str(process.pid).encode()
-            f.write(s)
-        sys.exit()
-
-    def supervise(self, pidfile, app, workdir=None):
-        if workdir is None:
-            workdir = os.path.dirname(pidfile)
-        self.kill_by_pidfile(pidfile)
-        self.start_with_pidfile(workdir, pidfile, app)
-
-
-if __name__ == '__main__':
-    g = Common()
-    a = g.prefix_zero(5, 111)