Explorar el Código

Merge pull request #92 from tracim/fix/600_fix_database_commands

Damien Accorsi hace 8 años
padre
commit
e978818570
No account linked to committer's email
Se han modificado 1 ficheros con 5 adiciones y 0 borrados
  1. 5 0
      tracim/command/database.py

+ 5 - 0
tracim/command/database.py Ver fichero

46
         config_uri = parsed_args.config_file
46
         config_uri = parsed_args.config_file
47
         setup_logging(config_uri)
47
         setup_logging(config_uri)
48
         settings = get_appsettings(config_uri)
48
         settings = get_appsettings(config_uri)
49
+        # INFO - G.M - 2018-06-178 - We need to add info from [DEFAULT]
50
+        # section of config file in order to have both global and
51
+        # web app specific param.
52
+        settings.update(settings.global_conf)
49
         self._create_schema(settings)
53
         self._create_schema(settings)
50
         self._populate_database(settings, add_test_data=parsed_args.test_data)
54
         self._populate_database(settings, add_test_data=parsed_args.test_data)
51
 
55
 
113
         config_uri = parsed_args.config_file
117
         config_uri = parsed_args.config_file
114
         setup_logging(config_uri)
118
         setup_logging(config_uri)
115
         settings = get_appsettings(config_uri)
119
         settings = get_appsettings(config_uri)
120
+        settings.update(settings.global_conf)
116
         engine = get_engine(settings)
121
         engine = get_engine(settings)
117
         app_config = CFG(settings)
122
         app_config = CFG(settings)
118
         app_config.configure_filedepot()
123
         app_config.configure_filedepot()