refactor: code restructure

1. split frontend and backend
2. simplify supervisor configuration
3. align backend log format with supervisor
4. set nginx worker to 1
5. delete static web pages

Author: dorowu-qnap

Dockerfile

@@ -38,7 +38,7 @@ RUN chmod +x /bin/tini
 RUN mkdir -p /usr/local/ffmpeg \
     && curl -sSL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1
 
-ADD image/usr/local/lib/web/requirements.txt /tmp/
+ADD image/usr/local/lib/web/backend/requirements.txt /tmp/
 RUN pip install setuptools wheel && pip install -r /tmp/requirements.txt
 ADD image /
 

image/etc/supervisor/conf.d/supervisord.conf

@@ -7,13 +7,13 @@ directory=/root
 [program:nginx]
 priority=10
 command=nginx -c /etc/nginx/nginx.conf -g 'daemon off;'
-stdout_logfile=/var/log/nginx.log
 
 [program:web]
 priority=10
-directory=/usr/local/lib/web
-command=/usr/local/lib/web/run.py
-stdout_logfile=/var/log/web.log
+directory=/usr/local/lib/web/backend
+command=/usr/local/lib/web/backend/run.py
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
 
 [group:x]
 programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc
@@ -22,38 +22,32 @@ programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc
 priority=10
 command=/usr/local/bin/xvfb.sh
 stopsignal=KILL
-stdout_logfile=/var/log/xvfb.log
 
 [program:wm]
 priority=15
 command=/usr/bin/openbox
 environment=DISPLAY=":1",HOME="/root",USER="root"
-stdout_logfile=/var/log/openbox.log
 
 [program:lxpanel]
 priority=15
 directory=%HOME%
 command=/usr/bin/lxpanel --profile LXDE
 user=%USER%
 environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"
-stdout_logfile=/var/log/lxpanel.log
 
 [program:pcmanfm]
 priority=15
 directory=%HOME%
 command=/usr/bin/pcmanfm --desktop --profile LXDE
 user=%USER%
 environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"
-stdout_logfile=/var/log/pcmanfm.log
 
 [program:x11vnc]
 priority=20
 command=x11vnc -display :1 -xkb -forever -shared -repeat
-stdout_logfile=/var/log/x11vnc.log
 
 [program:novnc]
 priority=25
 directory=/usr/local/lib/novnc/
 command=/usr/local/lib/novnc/utils/launch.sh --listen 6081
-stdout_logfile=/var/log/novnc.log
 stopasgroup=true

image/startup.sh

@@ -32,6 +32,9 @@ mkdir -p $HOME/.config/pcmanfm/LXDE/
 ln -sf /usr/local/share/doro-lxde-wallpapers/desktop-items-0.conf $HOME/.config/pcmanfm/LXDE/
 chown -R $USER:$USER $HOME
 
+# nginx
+sed -i 's#worker_processes .*#worker_processes 1;#' /etc/nginx/nginx.conf
+
 # clearup
 PASSWORD=
 

image/usr/local/lib/web/config/__init__.py renamed to image/usr/local/lib/web/backend/config/__init__.py

@@ -35,13 +35,13 @@ def format(self, record):
 
 
 class LoggingConfiguration(object):
-    COLOR_FORMAT = "[%(asctime)s" + \
-                   "][%(threadName)-22s][%(levelname)s] %(message)s " + \
+    COLOR_FORMAT = "%(asctime)s" + \
+                   " %(levelname)s %(message)s " + \
                    "(" + BOLD_SEQ + "%(filename)s" + RESET_SEQ + ":%(lineno)d)"
-    NO_COLOR_FORMAT = "[%(asctime)s][%(threadName)-22s][%(levelname)s] " + \
+    NO_COLOR_FORMAT = "%(asctime)s %(levelname)s " + \
                       "%(message)s " + \
                       "(%(filename)s:%(lineno)d)"
-    FILE_FORMAT = "[%(asctime)s][%(threadName)-22s][%(levelname)s] " + \
+    FILE_FORMAT = "%(asctime)s %(levelname)s " + \
                   "%(message)s "
 
     @classmethod

image/usr/local/lib/web/log/__init__.py renamed to image/usr/local/lib/web/backend/log/__init__.py

@@ -73,24 +73,19 @@ def run_server():
         import socket
 
         os.environ['CONFIG'] = CONFIG
-        from lightop import app
+        from vnc import app
 
         # websocket conflict: WebSocketHandler
         if DEBUG or STAGING:
             # from werkzeug.debug import DebuggedApplication
             app.debug = True
             # app = DebuggedApplication(app, evalex=True)
 
-        print('Fork monitor programs')
         pgid = os.getpgid(0)
-        procs = []
-        procs.extend([subprocess.Popen(program, close_fds=True, shell=True)
-                      for program in PROGRAMS])
         signal.signal(signal.SIGTERM, lambda *args: killpg(pgid))
         signal.signal(signal.SIGHUP, lambda *args: killpg(pgid))
         signal.signal(signal.SIGINT, lambda *args: killpg(pgid))
 
-        print('Running on port ' + str(PORT))
         try:
             app.run(host='', port=PORT)
         except socket.error as e:
@@ -101,7 +96,6 @@ def run_server():
     CONFIG = 'config.Development' if DEBUG else 'config.Production'
     CONFIG = 'config.Staging' if STAGING else CONFIG
     PORT = 6079
-    PROGRAMS = tuple()
     signal.signal(signal.SIGCHLD, signal.SIG_IGN)
 
     if DEBUG or STAGING:

image/usr/local/lib/web/log/config.py renamed to image/usr/local/lib/web/backend/log/config.py

@@ -10,11 +10,7 @@
 
 
 # Flask app
-app = Flask(
-    __name__,
-    static_folder='static', static_url_path='',
-    instance_relative_config=True
-)
+app = Flask('novnc2')
 CONFIG = os.environ.get('CONFIG') or 'config.Development'
 app.config.from_object('config.Default')
 app.config.from_object(CONFIG)