Skip to content
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

Jump to bottom

chore(docker-jans): add prefix jans to stdout logs #7762

Merged
merged 2 commits into from
Feb 19, 2024
Merged

chore(docker-jans): add prefix jans to stdout logs #7762

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
2048975
chore(docker-jans): add prefix jans to stdout logs
iromli Feb 16, 2024
19aadd6
Merge branch 'main' into cn-logs-prefix
moabu Feb 19, 2024
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
2 changes: 1 addition & 1 deletion docker-jans-auth-server/scripts/auth_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("auth")
logger = logging.getLogger("jans-auth")


def push_auth_conf(manager) -> None:
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from lock import LockPersistenceSetup

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("auth")
logger = logging.getLogger("jans-auth")

manager = get_manager()

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/scripts/jks_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
manager = get_manager()

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("auth")
logger = logging.getLogger("jans-auth")


def jks_created():
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/scripts/lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("auth")
logger = logging.getLogger("jans-auth")

manager = get_manager()

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/scripts/mod_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("auth")
logger = logging.getLogger("jans-auth")


Library = namedtuple("Library", ["path", "basename", "meta"])
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/scripts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"level": "INFO",
"propagate": True,
},
"auth": {
"jans-auth": {
"handlers": ["console"],
"level": "INFO",
"propagate": False,
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("auth")
logger = logging.getLogger("jans-auth")

Entry = namedtuple("Entry", ["id", "attrs"])

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/templates/jans-auth/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Configuration packages="io.jans.log">
<Properties>
<Property name="auth.log.console.prefix" value="auth" />
<Property name="auth.log.console.prefix" value="jans-auth" />
</Properties>
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/templates/jans-lock/log4j2-lock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration>
<Properties>
<Property name="lock.log.console.prefix" value="auth-lock" />
<Property name="lock.log.console.prefix" value="jans-auth-lock" />
</Properties>
<Appenders>
<Console name="Lock_Console" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/scripts/auth_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("casa")
logger = logging.getLogger("jans-casa")


manager = get_manager()
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("casa")
logger = logging.getLogger("jans-casa")

manager = get_manager()

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/scripts/jca_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
TMP_DIR = "/tmp/webdav"

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("casa")
logger = logging.getLogger("jans-casa")


def sync_from_webdav(url, username, password):
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/scripts/mod_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("casa")
logger = logging.getLogger("jans-casa")


Library = namedtuple("Library", ["path", "basename", "meta"])
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/scripts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"level": "INFO",
"propagate": True,
},
"casa": {
"jans-casa": {
"handlers": ["console"],
"level": "INFO",
"propagate": False,
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("casa")
logger = logging.getLogger("jans-casa")

Entry = namedtuple("Entry", ["id", "attrs"])

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/templates/jans-casa/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="ERROR">
<Properties>
<Property name="casa.log.console.prefix" value="casa" />
<Property name="casa.log.console.prefix" value="jans-casa" />
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from utils import get_config_api_scope_mapping

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("config-api")
logger = logging.getLogger("jans-config-api")


def main():
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/scripts/mod_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("config-api")
logger = logging.getLogger("jans-config-api")


Library = namedtuple("Library", ["path", "basename", "meta"])
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/scripts/plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("config-api")
logger = logging.getLogger("jans-config-api")

SUPPORTED_PLUGINS = (
"admin-ui",
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/scripts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"level": "INFO",
"propagate": True,
},
"config-api": {
"jans-config-api": {
"handlers": ["console"],
"level": "INFO",
"propagate": False,
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from utils import get_config_api_scope_mapping

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("config-api")
logger = logging.getLogger("jans-config-api")

Entry = namedtuple("Entry", ["id", "attrs"])

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/templates/jans-config-api/log4j2-adminui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Configuration packages="io.jans.log">
<Properties>
<Property name="admin_ui.log.console.prefix" value="config-api" />
<Property name="admin_ui.log.console.prefix" value="jans-config-api" />
</Properties>
<Appenders>
<Console name="AdminUI_Console" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/templates/jans-config-api/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="ERROR">
<Properties>
<Property name="config_api.log.console.prefix" value="config-api" />
<Property name="config_api.log.console.prefix" value="jans-config-api" />
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("fido2")
logger = logging.getLogger("jans-fido2")

manager = get_manager()

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/scripts/mod_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("fido2")
logger = logging.getLogger("jans-fido2")


Library = namedtuple("Library", ["path", "basename", "meta"])
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/scripts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"level": "INFO",
"propagate": True,
},
"fido2": {
"jans-fido2": {
"handlers": ["console"],
"level": "INFO",
"propagate": False,
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("fido2")
logger = logging.getLogger("jans-fido2")

Entry = namedtuple("Entry", ["id", "attrs"])

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/templates/jans-fido2/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Configuration packages="io.jans.log">
<Properties>
<Property name="fido2.log.console.prefix" value="fido2" />
<Property name="fido2.log.console.prefix" value="jans-fido2" />
</Properties>
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-keycloak-link/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@


logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("keycloak-link")
logger = logging.getLogger("jans-keycloak-link")

manager = get_manager()

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-keycloak-link/scripts/mod_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("keycloak-link")
logger = logging.getLogger("jans-keycloak-link")


Library = namedtuple("Library", ["path", "basename", "meta"])
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-keycloak-link/scripts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"level": "INFO",
"propagate": True,
},
"keycloak-link": {
"jans-keycloak-link": {
"handlers": ["console"],
"level": "INFO",
"propagate": False,
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-keycloak-link/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("keycloak-link")
logger = logging.getLogger("jans-keycloak-link")

Entry = namedtuple("Entry", ["id", "attrs"])

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-keycloak-link/templates/jans-keycloak-link/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration>
<Properties>
<Property name="keycloak_link.log.console.prefix" value="keycloak-link" />
<Property name="keycloak_link.log.console.prefix" value="jans-keycloak-link" />
</Properties>
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@


logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("link")
logger = logging.getLogger("jans-link")

manager = get_manager()

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/scripts/mod_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("link")
logger = logging.getLogger("jans-link")


Library = namedtuple("Library", ["path", "basename", "meta"])
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/scripts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"level": "INFO",
"propagate": True,
},
"link": {
"jans-link": {
"handlers": ["console"],
"level": "INFO",
"propagate": False,
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("link")
logger = logging.getLogger("jans-link")

Entry = namedtuple("Entry", ["id", "attrs"])

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/templates/jans-link/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration>
<Properties>
<Property name="link.log.console.prefix" value="link" />
<Property name="link.log.console.prefix" value="jans-link" />
</Properties>
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@


logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("scim")
logger = logging.getLogger("jans-scim")

manager = get_manager()

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/scripts/mod_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from settings import LOGGING_CONFIG

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("scim")
logger = logging.getLogger("jans-scim")


Library = namedtuple("Library", ["path", "basename", "meta"])
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/scripts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"level": "INFO",
"propagate": True,
},
"scim": {
"jans-scim": {
"handlers": ["console"],
"level": "INFO",
"propagate": False,
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from utils import parse_swagger_file

logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger("scim")
logger = logging.getLogger("jans-scim")

Entry = namedtuple("Entry", ["id", "attrs"])

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/templates/jans-scim/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="ERROR">
<Properties>
<Property name="scim.log.console.prefix" value="scim" />
<Property name="scim.log.console.prefix" value="jans-scim" />
</Properties>
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
Expand Down