Skip to content

feat: standardized cli #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devmaxde wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: standardized cli #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85951bf
feat: standardized cli
devmaxde Nov 26, 2024
be92959
Update Dockerfile metricq-version to 5.4
devmaxde Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/metricq/metricq-python:v5.3 AS builder
FROM ghcr.io/metricq/metricq-python:v5.4 AS builder
LABEL maintainer="mario.bielert@tu-dresden.de"

USER root
Expand All @@ -14,7 +14,7 @@ COPY --chown=metricq:metricq . /home/metricq/source-http
WORKDIR /home/metricq/source-http
RUN pip install --user .

FROM ghcr.io/metricq/metricq-python:v5.3
FROM ghcr.io/metricq/metricq-python:v5.4

USER metricq
COPY --from=BUILDER --chown=metricq:metricq /home/metricq/.local /home/metricq/.local
Expand Down
6 changes: 2 additions & 4 deletions metricq_source_http/source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import metricq
from hostlist import expand_hostlist # type: ignore
from metricq.logging import get_logger
from metricq.cli import metricq_command
from yarl import URL

from .version import __version__
Expand Down Expand Up @@ -501,10 +502,7 @@ async def task(self) -> None:
await self._stop_host_tasks()


@click.command()
@click.option("--server", default="amqp://localhost/")
@click.option("--token", default="source-http")
@click_log.simple_verbosity_option(logger) # type: ignore
@metricq_command(default_token = "source-http")
def main(server: str, token: str) -> None:
src = HttpSource(token=token, url=server)
src.run()
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ requires-python = ">=3.10"
dependencies = [
"click",
"click_log",
"metricq ~= 5.3",
"metricq[cli] ~= 5.4",
"aiohttp",
"jsonpath-rw",
"python-hostlist",
Expand Down