Commit fb4a6518 authored by Seblu's avatar Seblu
Browse files

Use two timeout (connection and command)

parent faf43ff9

bin/cc-cli

+6 −3
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ from cccli.exception import * 


settings = {

    "port": "1984",

    "timeout": "5",

    "contimeout": "5",

    "cmdtimeout" : "20",

    "hsize": "100",

    "alias": "%s/alias"%BaseDirectory.save_config_path(cccli.canonical_name),

    "tagdisplay": "%s/tagdisplay"%BaseDirectory.save_config_path(cccli.canonical_name),
@@ -51,8 +52,10 @@ try: 
                       help="Server hostname")

    oparser.add_option("-P", "--port",action="store",dest="port",

                       help="Server port")

    oparser.add_option("-t", "--timeout",action="store",dest="timeout",

    oparser.add_option("-t", "--con-timeout", action="store", dest="contimeout",

                       help="Connection timeout")

    oparser.add_option("-T", "--cmd-timeout",action="store",dest="cmdtimeout",

                       help="Command timeout")

    oparser.add_option("-p", "--profile",action="store",dest="profile",

                       help="Profile name")

    oparser.add_option("-l", "--list-profile", action="store_true",dest="proflist",
@@ -122,7 +125,7 @@ try: 
        raise BadArgument("No server address")



    # check int values

    for i in "port", "timeout", "hsize":

    for i in "port", "contimeout", "cmdtimeout", "hsize":

        try:

            settings[i] = int(settings[i])

        except:

cccli/cli.py

+7 −6
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ class Cli(object): 
                                                 enable_ssl=True,

                                                 default_handler=CliHandler(),

                                                 on_disconnect="quit",

                                             timeout=self.settings["timeout"]

                                                 timeout=self.settings["cmdtimeout"],

                                                 conn_timeout=self.settings["contimeout"]

                                                 )

            self.rpc.start(daemonize=True)

        except Exception as e:

examples/profile

+6 −0
Original line number Diff line number Diff line 
# Options in this section is loaded is each others section

[DEFAULT]

# history size in line

hsize = 1000

# debug mode

#debug = true

# connection timeout

#contimeout = 5

# command timeout

#cmdtimeout = 20



# This section is loaded at start

[cli]