update

lib/support/__init__.py

@@ -8,31 +8,9 @@ def d(data):
     else:
         return str(data)
 
-def load():
-    from .base.aes import SupportAES
-    from .base.discord import SupportDiscord
-    from .base.file import SupportFile
-    from .base.process import SupportProcess
-    from .base.string import SupportString
-    from .base.subprocess import SupportSubprocess
-    from .base.telegram import SupportTelegram
-    from .base.util import (AlchemyEncoder, SingletonClass, SupportUtil,
-                            default_headers, pt)
-    from .base.yaml import SupportYaml
-
-import os
-
-logger = None
-
-if os.environ.get('FF') == 'true':
-    def set_logger(l):
-        global logger
-        logger = l
-    
-else:
-    from .logger import get_logger
-    logger = get_logger()
+from .logger import get_logger
 
+logger = get_logger()
 
 from .base.aes import SupportAES
 from .base.discord import SupportDiscord
@@ -44,7 +22,3 @@ from .base.telegram import SupportTelegram
 from .base.util import (AlchemyEncoder, SingletonClass, SupportUtil,
                         default_headers, pt)
 from .base.yaml import SupportYaml
-
-# 일반 cli 사용 겸용이다.
-# set_logger 로 인한 진입이 아니고 import가 되면 기본 경로로 로그파일을
-# 생성하기 때문에, set_logger 전에 import가 되지 않도록 주의.

lib/support/base/__init__.py

@@ -1,12 +1,4 @@
 from support import d, logger
 
-from .aes import SupportAES
-from .discord import SupportDiscord
-from .ffmpeg import SupportFfmpeg
-from .file import SupportFile
-from .image import SupportImage
-from .process import SupportProcess
-from .string import SupportString
-from .util import (AlchemyEncoder, SingletonClass, SupportUtil,
-                   default_headers, pt)
-from .yaml import SupportYaml
+import support
+logger = support.logger

lib/support/base/subprocess.py

@@ -1,23 +1,29 @@
+import io
 import json
 import os
 import platform
+import queue
 import subprocess
+import threading
+import time
 import traceback
 
 from . import logger
 
 
+def demote(user_uid, user_gid):
+    def result():
+        os.setgid(user_gid)
+        os.setuid(user_uid)
+    return result
+
 class SupportSubprocess(object):
 
     # 2021-10-25
     # timeout 적용
     @classmethod
     def execute_command_return(cls, command, format=None, force_log=False, shell=False, env=None, timeout=None, uid=0, gid=0):
-        def demote(user_uid, user_gid):
-            def result():
-                os.setgid(user_gid)
-                os.setuid(user_uid)
-            return result
+
         try:
             if platform.system() == 'Windows':
                 tmp = []
@@ -74,3 +80,162 @@ class SupportSubprocess(object):
             logger.error('Exception:%s', exception)
             logger.error(traceback.format_exc())
             logger.error('command : %s', command)
+    
+
+    instance_list = []
+
+
+    def __init__(self, command,  print_log=False, shell=False, env=None, timeout=None, uid=0, gid=0, stdout_callback=None):
+        self.command = command
+        self.print_log = print_log
+        self.shell = shell
+        self.env = env
+        self.timeout = timeout
+        self.uid = uid
+        self.gid = gid
+        self.stdout_callback = stdout_callback
+        self.process = None
+        self.stdout_queue = None
+        
+
+    def start(self, join=True):
+        try:
+            self.thread = threading.Thread(target=self.execute_thread_function, args=())
+            self.thread.setDaemon(True)
+            self.thread.start()
+            if join:
+                self.thread.join()
+        except Exception as e: 
+            logger.error(f'Exception:{str(e)}')
+            logger.error(traceback.format_exc())
+
+
+    def execute_thread_function(self):
+        try:
+            if platform.system() == 'Windows':
+                tmp = []
+                if type(self.command) == type([]):
+                    for x in self.command:
+                        if x.find(' ') == -1:
+                            tmp.append(x)
+                        else:
+                            tmp.append(f'"{x}"')
+                    self.command = ' '.join(tmp)
+
+            iter_arg =  ''
+            if platform.system() == 'Windows':
+                self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8')
+            else:
+                self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, preexec_fn=demote(self.uid, self.gid), encoding='utf8')
+            SupportSubprocess.instance_list.append(self)
+            self.start_communicate()
+            self.start_send_callback()
+            if self.process is not None:
+                self.process.wait()
+            #logger.info(f"{self.command} 정상 종료")
+            if self.stdout_queue != None:
+                self.stdout_queue.put('<END>')
+        except Exception as e: 
+            logger.error(f'Exception:{str(e)}')
+            logger.error(traceback.format_exc())
+
+    
+
+    def start_communicate(self):
+        self.stdout_queue = queue.Queue()
+        sout = io.open(self.process.stdout.fileno(), 'rb', closefd=False)
+       
+        def Pump(stream):
+            _queue = queue.Queue()
+            
+            def rdr():
+                while True:
+                    if self.process == None:
+                        break
+                    buf = self.process.stdout.read(1)
+                    if buf:
+                        _queue.put( buf )
+                    else: 
+                        _queue.put( None )
+                        break
+                _queue.put( None )
+                time.sleep(1)
+
+            def clct():
+                active = True
+                while active:
+                    r = _queue.get()
+                    if r is None:
+                        break
+                    try:
+                        while True:
+                            r1 = _queue.get(timeout=0.005)
+                            if r1 is None:
+                                active = False
+                                break
+                            else:
+                                r += r1
+                    except:
+                        pass
+                    if r is not None:
+                        if self.stdout_queue != None:
+                            self.stdout_queue.put(r)
+                if self.stdout_queue != None: # 사용자 중지
+                    self.stdout_queue.put('<END>')
+            for tgt in [rdr, clct]:
+                th = threading.Thread(target=tgt)
+                th.setDaemon(True)
+                th.start()
+        Pump(sout)
+
+
+    def start_send_callback(self):
+        def func():
+            while self.stdout_queue:
+                line = self.stdout_queue.get()
+                if line == '<END>':
+                    if self.stdout_callback != None:
+                        self.stdout_callback('end', None)
+                    break
+                else:
+                    if self.stdout_callback != None:
+                        self.stdout_callback('log', line)
+            self.send_to_ui_thread = None
+            self.stdout_queue = None
+            self.process = None
+        
+        th = threading.Thread(target=func, args=())
+        th.setDaemon(True)
+        th.start()
+
+
+    def process_close(self):
+        try:
+            if self.process is not None and self.process.poll() is None:
+                #import psutil
+                #process = psutil.Process(instance.process.pid)
+                #for proc in instance.process.children(recursive=True):
+                #    proc.kill()
+                self.process.kill()
+        except Exception as e: 
+            logger.error(f'Exception:{str(e)}')
+            logger.error(traceback.format_exc())           
+        finally:
+            try:
+                self.stdout_queue = None 
+                self.process.kill()
+            except: pass
+
+    def input_command(self, cmd):
+        if self.process != None:
+            self.process.stdin.write(f'{cmd}\n')
+            self.process.stdin.flush()
+
+
+    @classmethod
+    def all_process_close(cls):
+        for instance in cls.instance_list:
+            instance.process_close()
+        cls.instance_list = []
+
+    

lib/support/logger.py

@@ -1,6 +1,11 @@
-import os, sys, logging, logging.handlers
+import logging
+import logging.handlers
+import os
+import sys
 from datetime import datetime
+
 from pytz import timezone, utc
+
 """
 ConsoleColor.Black => "\x1B[30m",
             ConsoleColor.DarkRed => "\x1B[31m",
@@ -48,6 +53,8 @@ class CustomFormatter(logging.Formatter):
 
 
 def get_logger(name=None, log_path=None):
+    if os.environ.get('FF') == 'true':
+        name = 'framework'
     if name == None:
         name = sys.argv[0].rsplit('.', 1)[0]
     logger = logging.getLogger(name)