diff options
| author |   Ladue, David (dl3158) <dl3158@att.com> | 2018-08-17 12:05:49 -0400 |
|---|---|---|
| committer | Ladue, David (dl3158) <dl3158@att.com> | 2018-08-17 12:06:05 -0400 |
| commit | 5f37a3be8fad7a2e795f508f7c216d679cebd28e (patch) | |
| tree | 8553969e7ab49b2546ac15dde1b79e9b7c1d834c | |
| parent | b7fef09b274c7153720dbd18c7952d73889bfc9a (diff) | |
updates to timeout variables
Change-Id: Ic7dfc585af74f3341b58ef53f16cb09f0cc94098
Issue-ID: DCAEGEN2-630
Signed-off-by: Ladue, David (dl3158) <dl3158@att.com>
| -rw-r--r-- | etc/snmptrapd.json | 4 | ||||
| -rw-r--r-- | snmptrap/mod/trapd_get_cbs_config.py | 4 | ||||
| -rw-r--r-- | snmptrap/snmptrapd.py | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/etc/snmptrapd.json b/etc/snmptrapd.json index e4fa44f..2061631 100644 --- a/etc/snmptrapd.json +++ b/etc/snmptrapd.json @@ -14,7 +14,7 @@ "dns_cache_ttl_seconds": 60 }, "publisher": { - "http_timeout_milliseconds": 1500, + "http_milliseconds_timeout": 1500, "http_retries": 3, "http_milliseconds_between_retries": 750, "http_primary_publisher": "true", @@ -50,7 +50,7 @@ "eelf_audit": "audit.log", "eelf_metrics": "metrics.log", "roll_frequency": "day", - "minimum_severity_to_log": 2 + "minimum_severity_to_log": 0 }, "trap_config": { "sw_interval_in_seconds": 60, diff --git a/snmptrap/mod/trapd_get_cbs_config.py b/snmptrap/mod/trapd_get_cbs_config.py index 1506dca..8bdff15 100644 --- a/snmptrap/mod/trapd_get_cbs_config.py +++ b/snmptrap/mod/trapd_get_cbs_config.py @@ -96,13 +96,13 @@ def get_cbs_config(): # recalc timeout, set default if not present try: - tds.timeout_seconds = tds.c_config['publisher']['http_timeout_milliseconds'] * 1000.0 + tds.timeout_seconds = tds.c_config['publisher']['http_milliseconds_timeout'] / 1000.0 except Exception as e: tds.timeout_seconds = 1.5 # recalc seconds_between_retries, set default if not present try: - tds.seconds_between_retries = tds.c_config['publisher']['http_milliseconds_between_retries'] * 1000.0 + tds.seconds_between_retries = tds.c_config['publisher']['http_milliseconds_between_retries'] / 1000.0 except Exception as e: tds.seconds_between_retries = .750 diff --git a/snmptrap/snmptrapd.py b/snmptrap/snmptrapd.py index cbf004b..66cc25f 100644 --- a/snmptrap/snmptrapd.py +++ b/snmptrap/snmptrapd.py @@ -175,12 +175,12 @@ def log_all_arriving_traps(): if curr_hour != tds.last_hour: roll_all_logs() tds.last_hour = curr_hour - else: - # otherwise, assume daily roll - curr_day = datetime.datetime.now().day - if curr_day != tds.last_day: - roll_all_logs() - tds.last_day = curr_day + else: + # otherwise, assume daily roll + curr_day = datetime.datetime.now().day + if curr_day != tds.last_day: + roll_all_logs() + tds.last_day = curr_day # always log arriving trap try: |