Skip to content

Commit 711f089

Browse files
committed
simplify main
Signed-off-by: Zen <[email protected]>
1 parent da13028 commit 711f089

File tree

3 files changed

+12
-22
lines changed

3 files changed

+12
-22
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "prometheus_exporter"
7-
version = "0.13.0"
7+
version = "0.13.2"
88
authors = [
99
{ name="Desultory", email="[email protected]" },
1010
]
@@ -17,7 +17,7 @@ classifiers = [
1717
"Operating System :: OS Independent",
1818
]
1919
dependencies = [
20-
"zenlib >= 1.6.5",
20+
"zenlib >= 1.7.0",
2121
"aiohttp >= 3.9.1"
2222
]
2323

src/prometheus_exporter/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@
33
from .metric import Metric
44
from .labels import Labels
55

6-
__all__ = ['Exporter', 'cached_exporter', 'Metric', 'Labels']
6+
DEFAULT_EXPORTER_ARGS = [
7+
{'flags': ['-p', '--port'], 'dest': 'listen_port', 'type': int, 'nargs': '?', 'help': 'Port to listen on.'},
8+
{'flags': ['-a', '--address'], 'dest': 'listen_ip', 'type': str, 'nargs': '?', 'help': 'Address to listen on.'},
9+
{'flags': ['config_file'], 'type': str, 'nargs': '?', 'help': 'Config file to use.'}]
10+
11+
__all__ = ['Exporter', 'cached_exporter', 'Metric', 'Labels', 'DEFAULT_EXPORTER_ARGS']

src/prometheus_exporter/main.py

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
1-
#!/usr/bin/env python3
2-
3-
4-
from zenlib.util import init_logger, init_argparser, process_args
5-
1+
from zenlib.util import get_kwargs
62
from .exporter import Exporter
3+
from .__init__ import DEFAULT_EXPORTER_ARGS
74

85

96
def main():
10-
argparser = init_argparser(prog=__package__, description='Metric Exporter for Prometheus')
11-
logger = init_logger(__package__)
12-
13-
argparser.add_argument('-p', '--port', type=int, nargs='?', help='Port to listen on.')
14-
argparser.add_argument('-a', '--address', type=str, nargs='?', help='Address to listen on.')
15-
16-
args = process_args(argparser, logger=logger)
17-
18-
kwargs = {'logger': logger}
19-
20-
if args.port:
21-
kwargs['listen_port'] = args.port
22-
if args.address:
23-
kwargs['listen_ip'] = args.address
7+
kwargs = get_kwargs(package=__package__, description='Metric Exporter for Prometheus',
8+
arguments=DEFAULT_EXPORTER_ARGS)
249

2510
exporter = Exporter(**kwargs)
2611
exporter.start()

0 commit comments

Comments
 (0)