Browse Source

Small bugfix in SLIM + add fogotten file to slim's Makefile.am

Forgotten file was the PID list file
The bugfix concerns the conf when selection mongodb as datasource (quick & dirty solution : keep dummmy_datasource loaded so we don't have to modify the original datasource conf)
Yann Weber 8 years ago
parent
commit
8b86ba32d1
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      progs/slim/Makefile.in
  2. 2
    2
      progs/slim/slim.py

+ 1
- 1
progs/slim/Makefile.in View File

@@ -245,7 +245,7 @@ slim_install_model__DATA = install_model/loader.py \
245 245
 
246 246
 slim_conf_model_dir = $(slim_install_model_dir)/conf.d/
247 247
 slim_conf_model__DATA = install_model/conf.d/lodel2.ini
248
-slim_var__DATA = slim_instances.json
248
+slim_var__DATA = slim_instances.json slim_instances_pid.json
249 249
 slim_var_dir = $(localstatedir)/lodel2/slim/
250 250
 do_subst = sed -e 's,\[@\]LODEL2_PROGSDIR\[@\],$(lodel2_scripts_dir),g' \
251 251
 	-e 's,\[@\]SLIM_DATADIR\[@\],$(slimdatadir),g' \

+ 2
- 2
progs/slim/slim.py View File

@@ -108,9 +108,9 @@ Selected interface is not the web iterface")
108 108
         if darg not in ('mongodb',):
109 109
             raise TypeError("Datasource_connectors can only be of : 'mongodb'")
110 110
         if darg.lower() == 'mongodb':
111
-            darg = 'mongodb_datasource'
111
+            darg = 'mongodb_datasource dummy_datasource'
112 112
         else:
113
-            darg = ''
113
+            darg = 'dummy_datasource'
114 114
         config['lodel2']['datasource_connectors'] = darg
115 115
     datasource_connectors = config['lodel2']['datasource_connectors']
116 116
     if datasource_connectors == 'mongodb_datasource':

Loading…
Cancel
Save