Bugfix in webui uswgi socket file creation

Now create an INSTANCE_NAME.sock in @localstatedir@/uwsgi_sockets
Note : the localstatedir is wrong -_- /usr/var instead of /var........

plugins/webui/main.py

@@ -5,6 +5,7 @@ import sys
 import shlex
 from lodel.plugin import LodelHook
 from lodel.settings import Settings
+from lodel import buildconf
 
 PLUGIN_PATH = os.path.dirname(__file__)
 
@@ -22,18 +23,27 @@ def uwsgi_fork(hook_name, caller, payload):
     if standalone.lower() == 'false':
         return
     else:
+        sockfile = os.path.join(buildconf.LODEL2VARDIR, 'uwsgi_sockets/')
+        if not os.path.isdir(sockfile):
+            os.mkdir(sockfile)
+        sockfile = os.path.join(sockfile,
+            Settings.sitename.replace('/','_') + '.sock')
         if standalone.lower() == 'true':
-            cmd='{uwsgi} --http-socket {addr}:{port} --module plugins.webui.run'
+            cmd='{uwsgi} --http-socket {addr}:{port} --module \
+plugins.webui.run --socket {sockfile}'
             cmd = cmd.format(
                         addr = Settings.webui.listen_address,
                         port = Settings.webui.listen_port,
-                        uwsgi= Settings.webui.uwsgicmd)
+                        uwsgi= Settings.webui.uwsgicmd,
+                        sockfile=sockfile)
             if Settings.webui.virtualenv is not None:
                 cmd += " --virtualenv %s" % Settings.webui.virtualenv
 
         elif Settings.webui.standalone == 'uwsgi':
-            cmd = '{uwsgi} --ini ./plugins/webui/uwsgi/uwsgi.ini'
-            cmd = cmd.format(uwsgi = Settings.webui.uwsgicmd)
+            cmd = '{uwsgi} --ini ./plugins/webui/uwsgi/uwsgi.ini \
+--socket {sockfile}'
+            cmd = cmd.format(uwsgi = Settings.webui.uwsgicmd, 
+                sockfile = sockfile)
         
         try:
             args = shlex.split(cmd)

plugins/webui/uwsgi/uwsgi.ini

@@ -2,7 +2,6 @@
 model = run:application
 plugin = python3
 module = plugins.webui.run
-socket = lodel2.sock
 chmod-socket = 666
 vacuum = true
 die-on-term = true #enable sigterm for killing

progs/slim/install_model/conf.d/lodel2.ini

@@ -21,7 +21,7 @@ dummy =
 dummy =
 
 [lodel2.logging.stderr]
-level = DEBUG
+level = INFO
 filename = -
 context = True
 

progs/slim/slim.py

@@ -86,7 +86,7 @@ def set_conf(name, args):
     if interface == 'webui':
         if 'lodel2.webui' not in config:
             config['lodel2.webui'] = dict()
-            config['lodel2.webui']['standalone'] = 'True'
+            config['lodel2.webui']['standalone'] = 'uwsgi'
         if args.listen_port is not None:
             config['lodel2.webui']['listen_port'] = str(args.listen_port)
         if args.listen_address is not None:
@@ -151,7 +151,7 @@ it" % name)
     logging.warning("Deleting instance %s" % name)
     logging.info("Deleting instance folder %s" % store_datas[name]['path'])
     shutil.rmtree(store_datas[name]['path'])
-    logging.info("Deleting instance from json store file")
+    logging.debug("Deleting instance from json store file")
     del(store_datas[name])
     save_datas(store_datas)
 
@@ -322,6 +322,10 @@ def details_instance(name, verbosity, batch):
         print(msg)
     else:
         msg = name
+        if name in pids and is_running(name, pids[name]):
+            msg += ' %d ' % pids[name]
+        else:
+            msg += ' stopped '
         if verbosity > 0:
             msg += "\t"+'"%s"' % store_datas[name]['path']
         if verbosity > 1:
@@ -418,10 +422,12 @@ if __name__ == '__main__':
         for name in args.name:
             new_instance(name)
     elif args.purge:
+        # SLIM Purge (stop & delete all)
         print("Do you really want to delete all the instances ? Yes/no ",)
         rep = sys.stdin.readline()
         if rep == "Yes\n":
             store = get_store_datas()
+            stop_instances(store.keys())
             for name in store:
                 delete_instance(name)
         elif rep.lower() != 'no':