Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 collectoss/api/gunicorn_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
umask = 0o007
reload = True
# this satisfies the type checker
is_dev = SystemEnv.get_bool("AUGUR_DEV", False)
is_dev = SystemEnv.get_bool("COLLECTOSS_DEV", False)

if is_dev:

Expand All @@ -42,7 +42,7 @@
logs_directory = get_value('Logging', 'logs_directory')

# this syntax satisfies the type checker
is_docker = SystemEnv.get_bool("AUGUR_DOCKER_DEPLOY", False)
is_docker = SystemEnv.get_bool("COLLECTOSS_DOCKER_DEPLOY", False)
accesslog = f"{logs_directory}/gunicorn.log"
errorlog = f"{logs_directory}/gunicorn.log"

Expand Down
2 changes: 1 addition & 1 deletion collectoss/api/routes/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from flask import request, jsonify, current_app
import sqlalchemy as s

# Disable the requirement for SSL by setting env["AUGUR_DEV"] = True
# Disable the requirement for SSL by setting env["COLLECTOSS_DEV"] = True
from collectoss.application.config import get_development_flag
from collectoss.application.db.lib import get_session
from collectoss.application.db.models import Config
Expand Down
2 changes: 1 addition & 1 deletion collectoss/application/cli/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def start(ctx, development, port):
raise e

if development:
SystemEnv.set("AUGUR_DEV", "1")
SystemEnv.set("COLLECTOSS_DEV", "1")
logger.info("Starting in development mode")

try:
Expand Down
10 changes: 5 additions & 5 deletions collectoss/application/cli/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

from keyman.KeyClient import KeyClient, KeyPublisher

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[pylint] reported by reviewdog 🐶
W0611: Unused KeyClient imported from keyman.KeyClient (unused-import)


reset_logs = SystemEnv.get_bool("AUGUR_RESET_LOGS", True)
reset_logs = SystemEnv.get_bool("COLLECTOSS_RESET_LOGS", True)

logger = SystemLogger("collectoss", reset_logfiles=reset_logs).get_logger()

Expand Down Expand Up @@ -72,10 +72,10 @@ def start(ctx, disable_collection, development, pidfile, port):
raise e

if development:
SystemEnv.set("AUGUR_DEV", "1")
SystemEnv.set("COLLECTOSS_DEV", "1")
logger.info("Starting in development mode")

SystemEnv.set("AUGUR_PIDFILE", pidfile)
SystemEnv.set("COLLECTOSS_PIDFILE", pidfile)

try:
gunicorn_location = os.getcwd() + "/collectoss/api/gunicorn_conf.py"
Expand All @@ -87,10 +87,10 @@ def start(ctx, disable_collection, development, pidfile, port):
if not port:
port = get_value("Server", "port")

SystemEnv.set("AUGUR_PORT", str(port))
SystemEnv.set("COLLECTOSS_PORT", str(port))

if disable_collection:
SystemEnv.set("AUGUR_DISABLE_COLLECTION", "1")
SystemEnv.set("COLLECTOSS_DISABLE_COLLECTION", "1")

core_worker_count = get_value("Celery", 'core_worker_count')
secondary_worker_count = get_value("Celery", 'secondary_worker_count')
Expand Down
2 changes: 1 addition & 1 deletion collectoss/application/cli/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def start(ctx, development):
keypub.publish(key, "gitlab_rest")

if development:
SystemEnv.set("AUGUR_DEV", "1")
SystemEnv.set("COLLECTOSS_DEV", "1")
logger.info("Starting in development mode")

core_worker_count = get_value("Celery", 'core_worker_count')
Expand Down
Loading