Commit fa11398b authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Configured log4j for conductor

parent 1cf7817b
......@@ -6,7 +6,7 @@ grpc-java:
clean:
$(MAKE) -C ../grpc-java clean
conductor: conductor-config conductor-service
conductor: conductor-config log4j-config conductor-service
tar xf mender-v2.2.0-1.tar.gz
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-system_protoc.patch
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-temporary_protoc-gen-grpc-java.patch
......@@ -23,6 +23,7 @@ conductor: conductor-config conductor-service
mkdir -p /opt/conductor
cp conductor-mender-v2.2.0-1/server/build/libs/conductor-server-*-all.jar /opt/conductor/conductor-server.jar
@echo "$$CONDUCTOR_CONFIG" > /opt/conductor/config.properties
@echo "$$LOG4J_CONFIG" > /opt/conductor/log4j.properties
@echo "$$CONDUCTOR_SERVICE" > /lib/systemd/system/conductor.service
systemctl enable conductor.service
......@@ -49,6 +50,20 @@ conductor.jetty.server.port=8080
endef
export CONDUCTOR_CONFIG
log4j-config:
define LOG4J_CONFIG
# Set root logger level to INFO and its only appender to A1.
log4j.rootLogger=INFO, A1
# A1 is set to be a ConsoleAppender.
log4j.appender.A1=org.apache.log4j.ConsoleAppender
# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=[%d{ISO8601}] [%t] %-5p %c %x - %m%n
endef
export LOG4J_CONFIG
conductor-service:
define CONDUCTOR_SERVICE
[Unit]
......@@ -60,7 +75,7 @@ Wants=network-online.target redis.service elasticsearch.service
Type=simple
User=root
Group=root
ExecStart=/opt/jdk/bin/java -jar /opt/conductor/conductor-server.jar /opt/conductor/config.properties
ExecStart=/opt/jdk/bin/java -jar /opt/conductor/conductor-server.jar /opt/conductor/config.properties /opt/conductor/log4j.properties
Restart=on-failure
[Install]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment