zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prepare for docker build

Browse source
This commit is contained in:
anhefti 2019-02-26 09:42:53 +01:00
parent 87ccf5b2a4
commit 24769034a4
3 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/resources/config/application-demo.properties
View file

@ -9,7 +9,6 @@ spring.datasource.driver-class-name=org.h2.Driver
spring.datasource.platform=demo spring.datasource.platform=demo
sebserver.webservice.api.admin.clientId=guiClient sebserver.webservice.api.admin.clientId=guiClient
sebserver.webservice.api.admin.clientSecret=guiClient
sebserver.webservice.api.admin.endpoint=/admin-api/v1 sebserver.webservice.api.admin.endpoint=/admin-api/v1
sebserver.webservice.api.admin.accessTokenValiditySeconds=1800 sebserver.webservice.api.admin.accessTokenValiditySeconds=1800
sebserver.webservice.api.admin.refreshTokenValiditySeconds=-1 sebserver.webservice.api.admin.refreshTokenValiditySeconds=-1
@ -26,7 +25,6 @@ sebserver.gui.webservice.protocol=http
sebserver.gui.webservice.address=0.0.0.0 sebserver.gui.webservice.address=0.0.0.0
sebserver.gui.webservice.port=8080 sebserver.gui.webservice.port=8080
sebserver.gui.webservice.apipath=/admin-api/v1 sebserver.gui.webservice.apipath=/admin-api/v1
sebserver.gui.theme=css/sebserver.css sebserver.gui.theme=css/sebserver.css
sebserver.gui.list.page.size=20
sebserver.gui.date.displayformat=EEEE, dd MMMM yyyy - HH:mm sebserver.gui.date.displayformat=EEEE, dd MMMM yyyy - HH:mm

42
src/main/resources/logback-spring.xml Normal file
View file

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false" scan="false">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} %-5level [%thread]:[%logger] %msg%n</pattern>
</encoder>
</appender>
<appender name="DEMO" class="ch.qos.logback.core.FileAppender">
<file> log-${byDay}.txt </file>
<append>true</append>
<encoder>
<pattern>%d{HH:mm:ss.SSS} %-5level [%thread]:[%logger] %msg%n</pattern>
</encoder>
</appender>
<springProfile name="dev">
<root level="INFO" additivity="true">
<appender-ref ref="STDOUT" />
</root>
<!-- <Logger name="ch.ethz.seb.sebserver" level="DEBUG" additivity="true" /> -->
<!-- <Logger name="org.mybatis.generator" level="INFO" additivity="true" /> -->
<!-- <Logger name="org.springframework.boot" level="INFO" additivity="true" /> -->
<!-- <Logger name="org.springframework.security" level="DEBUG" additivity="true" /> -->
<!-- <Logger name="org.springframework.web" level="DEBUG" additivity="true" /> -->
<!-- <Logger name="org.springframework.security.oauth2" level="DEBUG" additivity="true" /> -->
</springProfile>
<springProfile name="demo">
<root level="INFO" additivity="true">
<appender-ref ref="STDOUT" />
</root>
</springProfile>
</configuration>

20
src/main/resources/logback.xml
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false" scan="false">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} %-5level [%thread]:[%logger] %msg%n</pattern>
</encoder>
</appender>
<Logger name="ch.ethz.seb.sebserver" level="DEBUG" additivity="true" />
<Logger name="org.mybatis.generator" level="INFO" additivity="true" />
<Logger name="org.springframework.boot" level="INFO" additivity="true" />
<Logger name="org.springframework.security" level="DEBUG" additivity="true" />
<Logger name="org.springframework.web" level="DEBUG" additivity="true" />
<Logger name="org.springframework.security.oauth2" level="DEBUG" additivity="true" />
<root level="INFO" additivity="true">
<appender-ref ref="STDOUT" />
</root>
</configuration>