Browse Source

Updated the way webui runs uwsgi

using --plugin option instead of uwsgi_python3 shortcut (can be uwsgi_python34 etc)
Yann Weber 7 years ago
parent
commit
d855db99a8
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      plugins/webui/confspec.py
  2. 2
    2
      plugins/webui/main.py

+ 1
- 1
plugins/webui/confspec.py View File

@@ -10,7 +10,7 @@ CONFSPEC = {
10 10
                             SettingValidator('int')),
11 11
         'virtualenv': (None,
12 12
                        SettingValidator('path', none_is_valid=True)),
13
-        'uwsgicmd': ('/usr/bin/uwsgi_python3', SettingValidator('dummy')),
13
+        'uwsgicmd': ('/usr/bin/uwsgi', SettingValidator('dummy')),
14 14
         'cookie_secret_key': ('ConfigureYourOwnCookieSecretKey', SettingValidator('dummy')),
15 15
         'cookie_session_id': ('lodel', SettingValidator('dummy')),
16 16
     },

+ 2
- 2
plugins/webui/main.py View File

@@ -33,7 +33,7 @@ def uwsgi_fork(hook_name, caller, payload):
33 33
                 Settings.sitename.replace('/', '_')))
34 34
             
35 35
         if standalone.lower() == 'true':
36
-            cmd='{uwsgi} --http-socket {addr}:{port} --module \
36
+            cmd='{uwsgi} --plugin python3 --http-socket {addr}:{port} --module \
37 37
 plugins.webui.run --socket {sockfile} --logto {logfile}'
38 38
             cmd = cmd.format(
39 39
                         addr = Settings.webui.listen_address,
@@ -45,7 +45,7 @@ plugins.webui.run --socket {sockfile} --logto {logfile}'
45 45
                 cmd += " --virtualenv %s" % Settings.webui.virtualenv
46 46
 
47 47
         elif Settings.webui.standalone == 'uwsgi':
48
-            cmd = '{uwsgi} --ini ./plugins/webui/uwsgi/uwsgi.ini \
48
+            cmd = '{uwsgi} --plugin python3 --ini ./plugins/webui/uwsgi/uwsgi.ini \
49 49
 --socket {sockfile} --logto {logfile}'
50 50
             cmd = cmd.format(uwsgi = Settings.webui.uwsgicmd, 
51 51
                 sockfile = sockfile, logfile = logfile)

Loading…
Cancel
Save