Skip to content

Commit

Permalink
simplify url generation
Browse files Browse the repository at this point in the history
  • Loading branch information
DirtyRacer1337 committed Mar 24, 2024
1 parent f9defba commit 43d02a0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ ENV BUILD_DATE=$BUILD_DATE
ENV GIT_HASH=$GIT_HASH
ENV PROJECT_VERSION=$PROJECT_VERSION
EXPOSE 6980
HEALTHCHECK --interval=1m --timeout=30s CMD curl -s $(python3 -m namer url)api/healthcheck >/dev/null || exit 1
HEALTHCHECK --interval=1m --timeout=30s CMD curl -s $(python3 -m namer url)/api/healthcheck >/dev/null || exit 1
ENTRYPOINT ["python3", "-m", "namer", "watchdog"]
5 changes: 1 addition & 4 deletions namer/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import sys
from datetime import timedelta
from pathlib import Path
from queue import Queue

from loguru import logger
from requests_cache import CachedSession
Expand All @@ -25,7 +24,6 @@
import namer.web
from namer.configuration_utils import default_config
from namer.models import db
from namer.web.server import NamerWebServer

DESCRIPTION = (
namer.namer.DESCRIPTION
Expand Down Expand Up @@ -78,8 +76,7 @@ def main():
elif arg1 == 'suggest':
namer.metadataapi.main(arg_list[1:])
elif arg1 == 'url':
webserver = NamerWebServer(config, Queue())
print(webserver.get_url())
print(f'http://{config.host}:{config.port}{config.web_root}')
elif arg1 in ['-h', 'help', None]:
print(DESCRIPTION)

Expand Down

0 comments on commit 43d02a0

Please sign in to comment.