From d5479e55d5b0553aac7d69e14a33f1c2a98f58c5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 25 Dec 2021 18:29:29 +0000 Subject: [PATCH] Snake case --- daemon.py | 6 +++--- epicyon.py | 14 +++++++------- tests.py | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/daemon.py b/daemon.py index 16a4f44a1..90714566b 100644 --- a/daemon.py +++ b/daemon.py @@ -1743,7 +1743,7 @@ class PubServer(BaseHTTPRequestHandler): recordLoginFailure(base_dir, ipAddress, self.server.loginFailureCount, failTime, - self.server.logLoginFailures) + self.server.log_login_failures) self.server.POSTbusy = False return else: @@ -18407,7 +18407,7 @@ def runDaemon(content_license_url: str, max_like_count: int, shared_items_federated_domains: [], user_agents_blocked: [], - logLoginFailures: bool, + log_login_failures: bool, city: str, showNodeInfoAccounts: bool, showNodeInfoVersion: bool, @@ -18728,7 +18728,7 @@ def runDaemon(content_license_url: str, httpd.lastLoginTime = 0 httpd.lastLoginFailure = 0 httpd.loginFailureCount = {} - httpd.logLoginFailures = logLoginFailures + httpd.log_login_failures = log_login_failures httpd.maxReplies = maxReplies httpd.tokens = {} httpd.tokensLookup = {} diff --git a/epicyon.py b/epicyon.py index 57e0d93d3..41868838e 100644 --- a/epicyon.py +++ b/epicyon.py @@ -342,8 +342,8 @@ parser.add_argument("--iconsAsButtons", type=str2bool, nargs='?', const=True, default=False, help="Show header icons as buttons") -parser.add_argument("--logLoginFailures", - dest='logLoginFailures', +parser.add_argument("--log_login_failures", + dest='log_login_failures', type=str2bool, nargs='?', const=True, default=False, help="Whether to log longin failures") @@ -3118,10 +3118,10 @@ brochMode = \ if brochMode is not None: args.brochMode = bool(brochMode) -logLoginFailures = \ - getConfigParam(base_dir, 'logLoginFailures') -if logLoginFailures is not None: - args.logLoginFailures = bool(logLoginFailures) +log_login_failures = \ + getConfigParam(base_dir, 'log_login_failures') +if log_login_failures is not None: + args.log_login_failures = bool(log_login_failures) showNodeInfoAccounts = \ getConfigParam(base_dir, 'showNodeInfoAccounts') @@ -3216,7 +3216,7 @@ if __name__ == "__main__": args.low_bandwidth, args.max_like_count, shared_items_federated_domains, user_agents_blocked, - args.logLoginFailures, + args.log_login_failures, args.city, args.showNodeInfoAccounts, args.showNodeInfoVersion, diff --git a/tests.py b/tests.py index fdf91e514..578a377a3 100644 --- a/tests.py +++ b/tests.py @@ -789,7 +789,7 @@ def createServerAlice(path: str, domain: str, port: int, showNodeInfoAccounts = True showNodeInfoVersion = True city = 'London, England' - logLoginFailures = False + log_login_failures = False user_agents_blocked = [] max_like_count = 10 default_reply_interval_hrs = 9999999999 @@ -801,7 +801,7 @@ def createServerAlice(path: str, domain: str, port: int, low_bandwidth, max_like_count, shared_items_federated_domains, user_agents_blocked, - logLoginFailures, city, + log_login_failures, city, showNodeInfoAccounts, showNodeInfoVersion, brochMode, @@ -931,7 +931,7 @@ def createServerBob(path: str, domain: str, port: int, showNodeInfoAccounts = True showNodeInfoVersion = True city = 'London, England' - logLoginFailures = False + log_login_failures = False user_agents_blocked = [] max_like_count = 10 default_reply_interval_hrs = 9999999999 @@ -943,7 +943,7 @@ def createServerBob(path: str, domain: str, port: int, low_bandwidth, max_like_count, shared_items_federated_domains, user_agents_blocked, - logLoginFailures, city, + log_login_failures, city, showNodeInfoAccounts, showNodeInfoVersion, brochMode, @@ -1000,7 +1000,7 @@ def createServerEve(path: str, domain: str, port: int, federationList: [], showNodeInfoAccounts = True showNodeInfoVersion = True city = 'London, England' - logLoginFailures = False + log_login_failures = False user_agents_blocked = [] max_like_count = 10 low_bandwidth = True @@ -1013,7 +1013,7 @@ def createServerEve(path: str, domain: str, port: int, federationList: [], low_bandwidth, max_like_count, shared_items_federated_domains, user_agents_blocked, - logLoginFailures, city, + log_login_failures, city, showNodeInfoAccounts, showNodeInfoVersion, brochMode, @@ -1072,7 +1072,7 @@ def createServerGroup(path: str, domain: str, port: int, showNodeInfoAccounts = True showNodeInfoVersion = True city = 'London, England' - logLoginFailures = False + log_login_failures = False user_agents_blocked = [] max_like_count = 10 low_bandwidth = True @@ -1085,7 +1085,7 @@ def createServerGroup(path: str, domain: str, port: int, low_bandwidth, max_like_count, shared_items_federated_domains, user_agents_blocked, - logLoginFailures, city, + log_login_failures, city, showNodeInfoAccounts, showNodeInfoVersion, brochMode,