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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ formatting standardized.

## Copyright

Copyright © 2019-2024, SixSq SA
Copyright © 2019-2025, SixSq SA

## License

Expand Down
10 changes: 4 additions & 6 deletions code/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ See the documentation in the `rpm-container` module.
Logging
-------

The service assumes that `clojure.tools.logging` will be used with the
SLF4J and log4j implementation. These are included in the
dependencies. The test `log4j.properties` file will ignore all
logging. Modify this if you want to see the logging while testing.
The service assumes that `clojure.tools.logging` or `com.taoensso/telemere`
will be used.

The containerized server will provide a `log4j.properties` file that
logs everything to the console (as is typical for containers).
The containerized server will provide env variables that
logs info level and above to the console (as is typical for containers).
1 change: 1 addition & 0 deletions code/dev-resources/clojure.tools.logging.to-telemere.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
true
4 changes: 4 additions & 0 deletions code/dev-resources/taoensso.telemere.rt-min-level.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{:default :info
;:slf4j [["*" :debug]
; ["org.apache.zookeeper.*" :error]]
}
6 changes: 3 additions & 3 deletions code/project.clj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(def parent-version "6.8.0")
(def slf4j-version "2.0.12")
(def logback-version "1.5.3")
(def telemere-version "1.0.0-RC2")

(defproject com.sixsq.nuvla/ring
; x-release-please-start-version
Expand Down Expand Up @@ -43,8 +43,8 @@
[org.slf4j/log4j-over-slf4j ~slf4j-version]
[org.slf4j/jul-to-slf4j ~slf4j-version]
[org.slf4j/jcl-over-slf4j ~slf4j-version]
[ch.qos.logback/logback-classic ~logback-version]
[ch.qos.logback/logback-core ~logback-version]]
[com.taoensso/telemere ~telemere-version]
[com.taoensso/telemere-slf4j ~telemere-version]]

:profiles
{:test {:source-paths ["test"]
Expand Down
117 changes: 0 additions & 117 deletions code/test-resources/logback-test.xml

This file was deleted.

3 changes: 2 additions & 1 deletion container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ LABEL ci.build.number=${CI_BUILD_NUMBER}
LABEL ci.build.web.url=${CI_BUILD_WEB_URL}

COPY target/dependency/lib /opt/nuvla/server/lib
COPY src/scripts/log4j.properties /opt/nuvla/server/resources/
COPY src/scripts/start.sh /opt/nuvla/server/bin/
RUN chmod 0755 /opt/nuvla/server/bin/start.sh \
&& mkdir -p /opt/nuvla/server/lib.d/
Expand All @@ -26,6 +25,8 @@ RUN apk upgrade --update-cache --available && \
rm -rf /var/cache/apk/*

ENV NUVLA_SERVER_INIT=com.sixsq.nuvla.server.example/init
ENV CLOJURE_TOOLS_LOGGING_TO_TELEMERE=true
ENV TAOENSSO_TELEMERE_RT_MIN_LEVEL='{:default :info #_:slf4j #_[["*" :debug] ["org.apache.zookeeper.*" :error]]}'

EXPOSE 8200

Expand Down
8 changes: 0 additions & 8 deletions container/src/scripts/log4j.properties

This file was deleted.

Loading