#1277 Remove 'keepalive' option
Merged 3 years ago by mikem. Opened 3 years ago by tkopecek.
tkopecek/koji issue1239  into  master

file modified
+3 -4
@@ -5970,7 +5970,6 @@ 

                  'max_retries': 120,

                  'offline_retry': True,

                  'offline_retry_interval': 120,

-                 'keepalive': True,

                  'log_timestamps': False,

                  'timeout': None,

                  'no_ssl_verify': False,
@@ -6002,9 +6001,9 @@ 

                  except ValueError:

                      quit("value for %s option must be a valid integer" % name)

              elif name in ['offline_retry', 'use_createrepo_c',  'createrepo_skip_stat',

-                           'createrepo_update', 'keepalive', 'use_fast_upload',

-                           'support_rpm_source_layout', 'krb_rdns', 'krb_canon_host',

-                           'build_arch_can_fail', 'no_ssl_verify', 'log_timestamps']:

+                           'createrepo_update', 'use_fast_upload', 'support_rpm_source_layout',

+                           'krb_rdns', 'krb_canon_host', 'build_arch_can_fail', 'no_ssl_verify',

+                           'log_timestamps']:

                  defaults[name] = config.getboolean('kojid', name)

              elif name in ['plugin', 'plugins']:

                  defaults['plugin'] = value.split()

file modified
+2 -5
@@ -1651,7 +1651,6 @@ 

          'anon_retry' : None,

          'offline_retry' : None,

          'offline_retry_interval' : None,

-         'keepalive' : True,

          'timeout' : DEFAULT_REQUEST_TIMEOUT,

          'auth_timeout' : DEFAULT_AUTH_TIMEOUT,

          'use_fast_upload': False,
@@ -1717,9 +1716,8 @@ 

                  #options *can* be set via the config file. Such options should

                  #not have a default value set in the option parser.

                  if name in result:

-                     if name in ('anon_retry', 'offline_retry', 'keepalive',

-                                 'use_fast_upload', 'krb_rdns', 'debug',

-                                 'debug', 'debug_xmlrpc', 'krb_canon_host'):

+                     if name in ('anon_retry', 'offline_retry', 'use_fast_upload',

+                                 'krb_rdns', 'debug', 'debug', 'debug_xmlrpc', 'krb_canon_host'):

                          result[name] = config.getboolean(profile_name, name)

                      elif name in ('max_retries', 'retry_interval',

                                    'offline_retry_interval', 'poll_interval',
@@ -2069,7 +2067,6 @@ 

          'offline_retry',

          'offline_retry_interval',

          'anon_retry',

-         'keepalive',

          'timeout',

          'auth_timeout',

          'use_fast_upload',

@@ -17,7 +17,6 @@ 

                'offline_retry': True,

                'offline_retry_interval': 300,

                'anon_retry': True,

-               'keepalive': False,

                'timeout': 30000,

                'use_fast_upload': False,

                'upload_blocksize': 1024,
@@ -39,7 +38,6 @@ 

              'offline_retry': None,

              'offline_retry_interval': None,

              'anon_retry': None,

-             'keepalive': None,

              'timeout': None,

              'use_fast_upload': None,

              'upload_blocksize': None,
@@ -54,14 +52,12 @@ 

  MIXED_VAL = {'user': None,

               'password': None,

               'anon_retry': 3,

-              'keepalive': True,

               'timeout': 100,

               'krb_rdns': 'fakerdns',

               'meaningless': 'wow',

               'nonval': None}

  

  MIXED_REL = {'anon_retry': 3,

-              'keepalive': True,

               'timeout': 100,

               'krb_rdns': 'fakerdns',

               }