[REM] netrpc: KILL EVERYBODY

bzr revid: vmt@openerp.com-20130221121825-dvpacxajwztslukj
This commit is contained in:
Skrillex 2013-02-21 13:18:25 +01:00 committed by Vo Minh Thu
parent a961e5e377
commit de03f4d670
8 changed files with 9 additions and 34 deletions

4
debian/control vendored
View File

@ -52,6 +52,6 @@ Description: OpenERP Enterprise Resource Management
features are accounting (analytic and financial), stock management, sales and features are accounting (analytic and financial), stock management, sales and
purchases management, tasks automation, marketing campaigns, help desk, POS, purchases management, tasks automation, marketing campaigns, help desk, POS,
etc. Technical features include a distributed server, flexible workflows, an etc. Technical features include a distributed server, flexible workflows, an
object database, a dynamic GUI, customizable reports, and NET-RPC and XML-RPC object database, a dynamic GUI, customizable reports, and an XML-RPC
interfaces. interface.

View File

@ -103,9 +103,6 @@ General Options
--logfile=LOGFILE file where the server log will be stored --logfile=LOGFILE file where the server log will be stored
-n INTERFACE, --interface=INTERFACE specify the TCP IP address -n INTERFACE, --interface=INTERFACE specify the TCP IP address
-p PORT, --port=PORT specify the TCP port -p PORT, --port=PORT specify the TCP port
--net_interface=NETINTERFACE specify the TCP IP address for netrpc
--net_port=NETPORT specify the TCP port for netrpc
--no-netrpc disable netrpc
--no-xmlrpc disable xmlrpc --no-xmlrpc disable xmlrpc
-i INIT, --init=INIT init a module (use "all" for all modules) -i INIT, --init=INIT init a module (use "all" for all modules)
--without-demo=WITHOUT_DEMO load demo data for a module (use "all" for all modules) --without-demo=WITHOUT_DEMO load demo data for a module (use "all" for all modules)

View File

@ -6,6 +6,7 @@ Changelog
`trunk` `trunk`
------- -------
- Removed support for the ``NET-RPC`` protocol.
- Added the :ref:`Long polling <longpolling-worker>` worker type. - Added the :ref:`Long polling <longpolling-worker>` worker type.
- Added :ref:`orm-workflows` to the ORM. - Added :ref:`orm-workflows` to the ORM.
- Added :ref:`routing-decorators` to the RPC and WSGI stack. - Added :ref:`routing-decorators` to the RPC and WSGI stack.

View File

@ -80,17 +80,6 @@ specify the certificate file for the SSL connection
\fB\-\-pkey\-file\fR=\fISECURE_PKEY_FILE\fR \fB\-\-pkey\-file\fR=\fISECURE_PKEY_FILE\fR
specify the private key file for the SSL connection specify the private key file for the SSL connection
.IP .IP
NET\-RPC Configuration:
.TP
\fB\-\-netrpc\-interface\fR=\fINETRPC_INTERFACE\fR
specify the TCP IP address for the NETRPC protocol
.TP
\fB\-\-netrpc\-port\fR=\fINETRPC_PORT\fR
specify the TCP port for the NETRPC protocol
.TP
\fB\-\-no\-netrpc\fR
disable the NETRPC protocol
.IP
Static HTTP service: Static HTTP service:
.TP .TP
\fB\-\-static\-http\-enable\fR \fB\-\-static\-http\-enable\fR

View File

@ -13,6 +13,6 @@ Description: OpenERP is a complete ERP and CRM. The main features are accounting
and financial), stock management, sales and purchases management, tasks and financial), stock management, sales and purchases management, tasks
automation, marketing campaigns, help desk, POS, etc. Technical features include automation, marketing campaigns, help desk, POS, etc. Technical features include
a distributed server, flexible workflows, an object database, a dynamic GUI, a distributed server, flexible workflows, an object database, a dynamic GUI,
customizable reports, and NET-RPC and XML-RPC interfaces. customizable reports, and an XML-RPC interface.
Keywords: ERP, Accounting, Stock, CRM, Enterprise, Logistics, Management, Sales, Purchases Keywords: ERP, Accounting, Stock, CRM, Enterprise, Logistics, Management, Sales, Purchases
Platform: Linux, Win32 Platform: Linux, Win32

View File

@ -205,8 +205,8 @@ def log(logger, level, prefix, msg, depth=None):
def dispatch_rpc(service_name, method, params): def dispatch_rpc(service_name, method, params):
""" Handle a RPC call. """ Handle a RPC call.
This is pure Python code, the actual marshalling (from/to XML-RPC or This is pure Python code, the actual marshalling (from/to XML-RPC) is done
NET-RPC) is done in a upper layer. in a upper layer.
""" """
try: try:
rpc_request = logging.getLogger(__name__ + '.rpc.request') rpc_request = logging.getLogger(__name__ + '.rpc.request')

View File

@ -142,17 +142,6 @@ class configmanager(object):
help="specify the private key file for the SSL connection") help="specify the private key file for the SSL connection")
parser.add_option_group(group) parser.add_option_group(group)
# NET-RPC
group = optparse.OptionGroup(parser, "NET-RPC Configuration")
group.add_option("--netrpc-interface", dest="netrpc_interface", my_default='',
help="specify the TCP IP address for the NETRPC protocol")
group.add_option("--netrpc-port", dest="netrpc_port", my_default=8070,
help="specify the TCP port for the NETRPC protocol", type="int")
# Needed a few day for runbot and saas
group.add_option("--no-netrpc", dest="netrpc", action="store_false", my_default=False, help="disable the NETRPC protocol")
group.add_option("--netrpc", dest="netrpc", action="store_true", my_default=False, help="enable the NETRPC protocol")
parser.add_option_group(group)
# WEB # WEB
# TODO move to web addons after MetaOption merge # TODO move to web addons after MetaOption merge
group = optparse.OptionGroup(parser, "Web interface Configuration") group = optparse.OptionGroup(parser, "Web interface Configuration")
@ -383,8 +372,8 @@ class configmanager(object):
'db_name', 'db_user', 'db_password', 'db_host', 'db_name', 'db_user', 'db_password', 'db_host',
'db_port', 'db_template', 'logfile', 'pidfile', 'smtp_port', 'db_port', 'db_template', 'logfile', 'pidfile', 'smtp_port',
'email_from', 'smtp_server', 'smtp_user', 'smtp_password', 'email_from', 'smtp_server', 'smtp_user', 'smtp_password',
'netrpc_interface', 'netrpc_port', 'db_maxconn', 'import_partial', 'addons_path', 'db_maxconn', 'import_partial', 'addons_path',
'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone', 'xmlrpc', 'syslog', 'without_demo', 'timezone',
'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs', 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs',
'static_http_enable', 'static_http_document_root', 'static_http_url_prefix', 'static_http_enable', 'static_http_document_root', 'static_http_url_prefix',
'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level' 'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level'
@ -407,7 +396,7 @@ class configmanager(object):
keys = [ keys = [
'language', 'translate_out', 'translate_in', 'overwrite_existing_translations', 'language', 'translate_out', 'translate_in', 'overwrite_existing_translations',
'debug_mode', 'smtp_ssl', 'load_language', 'debug_mode', 'smtp_ssl', 'load_language',
'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', 'stop_after_init', 'logrotate', 'without_demo', 'xmlrpc', 'syslog',
'list_db', 'xmlrpcs', 'proxy_mode', 'list_db', 'xmlrpcs', 'proxy_mode',
'test_file', 'test_enable', 'test_commit', 'test_report_directory', 'test_file', 'test_enable', 'test_commit', 'test_report_directory',
'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent', 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',

View File

@ -12,6 +12,5 @@ rm openerp-server.log
--stop-after-init \ --stop-after-init \
--no-xmlrpc \ --no-xmlrpc \
--no-xmlrpcs \ --no-xmlrpcs \
--no-netrpc \
--test-enable \ --test-enable \
--logfile=openerp-server.log --logfile=openerp-server.log