README.md

@@ -36,19 +36,12 @@ Chacun de ces services documente la structure de la table mais ne se charge pas
 La création de la table, selon le schéma fournit dans la documentation, est à la charge de l’administrateur du système.
 
 # Empty database:
+su - postgres
+psql -U postgres risotto
+drop table log; drop table userrole; drop table release; drop table source; drop table server; drop table servermodel; drop table applicationservice; drop table roleuri;  drop table risottouser; drop table uri;
 
-````
-psql -U postgres
-drop database risotto;
-drop user risotto;
-\q
-reconfigure
-```
-
-```
 psql -U postgres tiramisu
 drop table value; drop table property; drop table permissive; drop table information; drop table session;
-```
 
 # Import EOLE
 ./script/cucchiaiata source.create -n eole -u http://localhost

src/risotto/config.py

@@ -3,7 +3,7 @@ from os import environ
 
 CONFIGURATION_DIR = environ.get('CONFIGURATION_DIR', '/srv/risotto/configurations')
 PROVIDER_FACTORY_CONFIG_DIR = environ.get('PROVIDER_FACTORY_CONFIG_DIR', '/srv/factory')
-TMP_DIR = '/tmp'
+TMP_DIR = 'tmp'
 DEFAULT_USER = environ.get('DEFAULT_USER', 'Anonymous')
 RISOTTO_DB_NAME = environ.get('RISOTTO_DB_NAME', 'risotto')
 RISOTTO_DB_PASSWORD = environ.get('RISOTTO_DB_PASSWORD', 'risotto')
@@ -19,7 +19,7 @@ SRV_SEED_PATH = environ.get('SRV_SEED_PATH', '/srv/seed')
 
 
 def dsn_factory(database, user, password, address=DB_ADDRESS):
-    mangled_address = '/var/run/postgresql' if address == 'localhost' else address
+    mangled_address = '/var/run/postgresql' if address == 'localhost' else address 
     return f'postgres:///{database}?host={mangled_address}/&user={user}&password={password}'
 
 

src/risotto/dispatcher.py

@@ -147,39 +147,40 @@ class PublishDispatcher:
                                      check_role,
                                      kwargs,
                                      function_objs)
-        try:
+        else:
-            async with self.pool.acquire() as connection:
+            try:
-                await connection.set_type_codec(
+                async with self.pool.acquire() as connection:
-                    'json',
+                    await connection.set_type_codec(
-                    encoder=dumps,
+                        'json',
-                    decoder=loads,
+                        encoder=dumps,
-                    schema='pg_catalog'
+                        decoder=loads,
-                )
+                        schema='pg_catalog'
-                risotto_context.connection = connection
+                    )
-                async with connection.transaction():
+                    risotto_context.connection = connection
-                    return await self.launch(version,
+                    async with connection.transaction():
-                                             message,
+                        return await self.launch(version,
-                                             risotto_context,
+                                                 message,
-                                             check_role,
+                                                 risotto_context,
-                                             kwargs,
+                                                 check_role,
-                                             function_objs)
+                                                 kwargs,
-        except CallError as err:
+                                                 function_objs)
-            raise err
+            except CallError as err:
-        except Exception as err:
+                raise err
-            # if there is a problem with arguments, just send an error and do nothing
+            except Exception as err:
-            if get_config()['global']['debug']:
+                # if there is a problem with arguments, just send an error and do nothing
-                print_exc()
+                if get_config()['global']['debug']:
-            async with self.pool.acquire() as connection:
+                    print_exc()
-                await connection.set_type_codec(
+                async with self.pool.acquire() as connection:
-                    'json',
+                    await connection.set_type_codec(
-                    encoder=dumps,
+                        'json',
-                    decoder=loads,
+                        encoder=dumps,
-                    schema='pg_catalog'
+                        decoder=loads,
-                )
+                        schema='pg_catalog'
-                risotto_context.connection = connection
+                    )
-                async with connection.transaction():
+                    risotto_context.connection = connection
-                    await log.error_msg(risotto_context, kwargs, err)
+                    async with connection.transaction():
-            raise err
+                        await log.error_msg(risotto_context, kwargs, err)
+                raise err
 
 
 class Dispatcher(register.RegisterDispatcher,
@@ -328,6 +329,8 @@ class Dispatcher(register.RegisterDispatcher,
                     if key in function_obj['arguments']:
                         kw[key] = value
 
+
+
             kw['risotto_context'] = risotto_context
             returns = await function(self.injected_self[function_obj['module']], **kw)
             if risotto_context.type == 'rpc':