From c7721cce43e780d998734abb2d1baaa4f4533627 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Wed, 23 Jan 2019 08:52:43 +0100
Subject: [PATCH] Update woken-messages to 2.9.3
---
Dockerfile | 8 ++++++--
pom.xml | 2 +-
src/main/java/eu/hbp/mip/MIPApplication.java | 10 ++--------
.../hbp/mip/configuration/BugsnagConfiguration.java | 5 +++++
src/main/resources/reference.conf | 2 ++
.../scala/ch.chuv.lren/mip/portal/Reporting.scala | 11 +++++++++++
6 files changed, 27 insertions(+), 11 deletions(-)
create mode 100644 src/main/scala/ch.chuv.lren/mip/portal/Reporting.scala
diff --git a/Dockerfile b/Dockerfile
index 64d96a7e4..a163ccbfc 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 101ac8987..9700cf49a 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 d85f8c13e..6717b3b98 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 36770fcbc..d97fa7809 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 c6ce4a903..5c485b2d8 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 000000000..e14987957
--- /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()
+ }
+
+}
--
GitLab