diff --git a/Dockerfile b/Dockerfile index 64d96a7e4304fdcd5fee7850576cc5a4e0c122ba..a163ccbfc926a4c8f56c866cdb78727b3e528b1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,12 @@ ARG BUILD_DATE ARG VCS_REF ARG VERSION -ENV CONTEXT_PATH "/services" \ - BUGSNAG_KEY "dff301aa15eb795a6d8b22b600586f77" +ENV APP_NAME="Portal backend" \ + APP_TYPE="Spring" \ + VERSION=$VERSION \ + BUILD_DATE=$BUILD_DATE \ + CONTEXT_PATH="/services" \ + BUGSNAG_KEY="dff301aa15eb795a6d8b22b600586f77" RUN apt-get update && apt-get install -y --no-install-recommends curl \ && rm -rf /var/lib/apt/lists/* /tmp/* diff --git a/pom.xml b/pom.xml index 101ac8987d5ce3ef9d959a3e64ecc811cc397e94..9700cf49a3326b1456e7392dac1c5a98a56d6d65 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ <spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version> <spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version> <aspectjweaver.version>1.8.9</aspectjweaver.version> - <woken-messages.version>2.9.2</woken-messages.version> + <woken-messages.version>2.9.3</woken-messages.version> <javax-inject.version>1</javax-inject.version> <akka.version>2.5.19</akka.version> <spring-context.version>4.3.4.RELEASE</spring-context.version> diff --git a/src/main/java/eu/hbp/mip/MIPApplication.java b/src/main/java/eu/hbp/mip/MIPApplication.java index d85f8c13e7791942fda20c95f385494611ee63bf..6717b3b982d2f19ef02f8a4b893f0a75877385a7 100644 --- a/src/main/java/eu/hbp/mip/MIPApplication.java +++ b/src/main/java/eu/hbp/mip/MIPApplication.java @@ -6,15 +6,9 @@ package eu.hbp.mip; import eu.hbp.mip.configuration.*; import org.springframework.boot.SpringApplication; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; +import org.springframework.boot.autoconfigure.SpringBootApplication; - -@Configuration -//@EnableAutoConfiguration(exclude = { ValidationAutoConfiguration.class }) -@Import({ AkkaConfiguration.class, BugsnagConfiguration.class, - CacheConfiguration.class, PersistenceConfiguration.class, - SecurityConfiguration.class, WebConfiguration.class}) +@SpringBootApplication public class MIPApplication { public static void main(String[] args) { diff --git a/src/main/java/eu/hbp/mip/configuration/BugsnagConfiguration.java b/src/main/java/eu/hbp/mip/configuration/BugsnagConfiguration.java index 36770fcbce191dea8c8273d5d547edfbd35665f6..d97fa780978dd561036d5cb645e5cb528c72e07b 100644 --- a/src/main/java/eu/hbp/mip/configuration/BugsnagConfiguration.java +++ b/src/main/java/eu/hbp/mip/configuration/BugsnagConfiguration.java @@ -1,5 +1,6 @@ package eu.hbp.mip.configuration; +import ch.chuv.lren.mip.portal.Reporting; import com.bugsnag.Bugsnag; import com.bugsnag.BugsnagSpringConfiguration; import org.springframework.context.annotation.Bean; @@ -9,6 +10,10 @@ import org.springframework.context.annotation.Import; @Configuration @Import(BugsnagSpringConfiguration.class) public class BugsnagConfiguration { + static { + new Reporting().init(); + } + @Bean public Bugsnag bugsnag() { return new Bugsnag(System.getenv("BUGSNAG_KEY")); diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index c6ce4a9034d3dcca6d4d801997217c78b775684b..5c485b2d8f44872cfcb7943c7299f807406deb83 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -1,5 +1,7 @@ app { + name = "Portal backend" + type = "Spring" clusterSystemName = ${clustering.cluster.name} } diff --git a/src/main/scala/ch.chuv.lren/mip/portal/Reporting.scala b/src/main/scala/ch.chuv.lren/mip/portal/Reporting.scala new file mode 100644 index 0000000000000000000000000000000000000000..e14987957ec6e1f0876b463f3a5b9e1d0f635002 --- /dev/null +++ b/src/main/scala/ch.chuv.lren/mip/portal/Reporting.scala @@ -0,0 +1,11 @@ +package ch.chuv.lren.mip.portal + +import ch.chuv.lren.woken.errors._ + +class Reporting { + + def init(): Unit = { + reportErrorsToBugsnag() + } + +}