Commit 6b87e650 authored by Jérome Perrin's avatar Jérome Perrin

remove --erp5_sql_deferred_connection_string argument, because we no longer allow

to select different connection strings for normal and deferred connections
since 28891


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28893 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0de89adf
...@@ -199,12 +199,6 @@ def _getConnectionStringDict(): ...@@ -199,12 +199,6 @@ def _getConnectionStringDict():
if erp5_sql_transactionless_connection_string: if erp5_sql_transactionless_connection_string:
connection_string_dict['erp5_sql_transactionless_connection_string'] = \ connection_string_dict['erp5_sql_transactionless_connection_string'] = \
erp5_sql_transactionless_connection_string erp5_sql_transactionless_connection_string
erp5_sql_deferred_connection_string = os.environ.get(
'erp5_sql_deferred_connection_string',
os.environ.get('erp5_sql_connection_string'))
if erp5_sql_deferred_connection_string:
connection_string_dict['erp5_sql_deferred_connection_string'] = \
erp5_sql_deferred_connection_string
return connection_string_dict return connection_string_dict
......
...@@ -40,10 +40,6 @@ Options: ...@@ -40,10 +40,6 @@ Options:
ZSQL Connection string for ZSQL Connection string for
cmf_activity_sql_connection (if unset, defaults to cmf_activity_sql_connection (if unset, defaults to
erp5_sql_connection_string) erp5_sql_connection_string)
--erp5_sql_deferred_connection_string=STRING
ZSQL Connection string for
erp5_sql_deferred_connection (if unset, defaults
to erp5_sql_connection_string)
--email_from_address=STRING --email_from_address=STRING
Initialise the email_from_address property of the Initialise the email_from_address property of the
portal, by default, CMFActivity failures are sent portal, by default, CMFActivity failures are sent
...@@ -393,7 +389,6 @@ def main(): ...@@ -393,7 +389,6 @@ def main():
"bt5_path=", "bt5_path=",
"recreate_catalog=", "erp5_sql_connection_string=", "recreate_catalog=", "erp5_sql_connection_string=",
"cmf_activity_sql_connection_string=", "cmf_activity_sql_connection_string=",
"erp5_sql_deferred_connection_string=",
"erp5_catalog_storage=", "erp5_catalog_storage=",
"save", "save",
"load", "load",
...@@ -442,8 +437,6 @@ def main(): ...@@ -442,8 +437,6 @@ def main():
os.environ["erp5_sql_connection_string"] = arg os.environ["erp5_sql_connection_string"] = arg
elif opt == "--cmf_activity_sql_connection_string": elif opt == "--cmf_activity_sql_connection_string":
os.environ["cmf_activity_sql_connection_string"] = arg os.environ["cmf_activity_sql_connection_string"] = arg
elif opt == "--erp5_sql_deferred_connection_string":
os.environ["erp5_sql_deferred_connection_string"] = arg
elif opt == "--email_from_address": elif opt == "--email_from_address":
os.environ["email_from_address"] = arg os.environ["email_from_address"] = arg
elif opt == "--save": elif opt == "--save":
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment