diff options
| author |   Kerim Gokarslan <kgokarsl@cisco.com> | 2017-10-17 10:42:58 -0700 |
|---|---|---|
| committer | Kerim Gokarslan <kgokarsl@cisco.com> | 2017-10-17 12:41:49 -0700 |
| commit | 5be3729e65156be16a88d94e8943b79edf3f7eb0 (patch) | |
| tree | b5d31fa7f0e8f71e4d6ad953d7b2d003534d83a6 /nfvbench | |
| parent | a79debff4a6436522feebd2221865a2a6a917a58 (diff) | |
NFVBENCH-41 Add fluentd result tag to nfvbench server
Change-Id: I8fc274d9f9ee2211636336bc58f43f4d105986ef
Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
Diffstat (limited to 'nfvbench')
| -rw-r--r-- | nfvbench/nfvbench.py | 4 | ||||
| -rw-r--r-- | nfvbench/nfvbenchd.py | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py index 24cbb72..bbee4f4 100644 --- a/nfvbench/nfvbench.py +++ b/nfvbench/nfvbench.py @@ -44,7 +44,6 @@ from summarizer import NFVBenchSummarizer from traffic_client import TrafficGeneratorFactory import utils - fluent_logger = None @@ -532,7 +531,8 @@ def main(): if opts.server: if os.path.isdir(opts.server): - server = WebSocketIoServer(opts.server, nfvbench_instance, fluent_logger) + server = WebSocketIoServer(opts.server, nfvbench_instance, fluent_logger, + config.fluentd.result_tag) nfvbench_instance.set_notifier(server) try: port = int(opts.port) diff --git a/nfvbench/nfvbenchd.py b/nfvbench/nfvbenchd.py index 15b71c5..1797496 100644 --- a/nfvbench/nfvbenchd.py +++ b/nfvbench/nfvbenchd.py @@ -33,7 +33,6 @@ from log import LOG from utils import byteify from utils import RunLock - # this global cannot reside in Ctx because of the @app and @socketio decorators app = None socketio = None @@ -211,14 +210,14 @@ class WebSocketIoServer(object): of this class and pass a runner object then invoke the run method """ - def __init__(self, http_root, runner, logger): + def __init__(self, http_root, runner, logger, result_tag): self.nfvbench_runner = runner setup_flask(http_root) self.fluent_logger = logger self.result_fluent_logger = None - if self.fluent_logger: + if result_tag: self.result_fluent_logger = \ - FluentLogHandler("resultnfvbench", + FluentLogHandler(result_tag, fluentd_ip=self.fluent_logger.sender.host, fluentd_port=self.fluent_logger.sender.port) self.result_fluent_logger.runlogdate = self.fluent_logger.runlogdate |