[FIX] core: handle gevent on command line correctly

Author: KangOl

odoo/__init__.py

@@ -9,7 +9,12 @@
 # Is the server running with gevent.
 import sys
 evented = False
-if sys.modules.get("gevent") is not None:
+if len(sys.argv) > 1 and sys.argv[1] == 'gevent':
+    sys.argv.remove('gevent')
+    import gevent.monkey
+    gevent.monkey.patch_all()
+    import psycogreen.gevent
+    psycogreen.gevent.patch_psycopg()
     evented = True
 
 # Is the server running in prefork mode (e.g. behind Gunicorn).

odoo/cli/command.py

@@ -62,3 +62,5 @@ def main():
     if command in commands:
         o = commands[command]()
         o.run(args)
+    else:
+        sys.exit('Unknow command %r' % (command,))

odoo/service/server.py

@@ -443,9 +443,8 @@ def worker_spawn(self, klass, workers_registry):
 
     def long_polling_spawn(self):
         nargs = stripped_sys_argv()
-        cmd = os.path.join(os.path.dirname(nargs[0]), "odoo.py")
-        nargs = [cmd, 'gevent'] + nargs[1:]
-        popen = subprocess.Popen([sys.executable] + nargs)
+        cmd = [sys.executable, sys.argv[0], 'gevent'] + nargs[1:]
+        popen = subprocess.Popen(cmd)
         self.long_polling_pid = popen.pid
 
     def worker_pop(self, pid):

setup/setup_dev.py

@@ -153,14 +153,7 @@ def main():
     elif len(sys.argv) == 2 and sys.argv[1] in cmds:
         cmds[sys.argv[1]]()
     else:
-        if len(sys.argv) > 1 and sys.argv[1] == 'gevent':
-            sys.argv.remove('gevent')
-            import gevent.monkey
-            gevent.monkey.patch_all()
-            import psycogreen.gevent
-            psycogreen.gevent.patch_psycopg()
-        import odoo
-        odoo.cli.main()
+        sys.exit('Unknow command. Command available: %r' % (cmds.keys(),))
 
 if __name__ == "__main__":
     main()