Allow overriding of initial modules. Updated mime types.

noboomu · Dec 30, 2020 · 1913b8f · 1913b8f
1 parent 5297710
commit 1913b8f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Proteus Changelog.
 ## Unreleased
 ### No issue
 
+**Improve health information.**
+
+
+[52977106d9337f8](https://github.com/noboomu/proteus/commit/52977106d9337f8) Joshua Bauer *2020-12-14 18:15:36*
+
 **Removed swagger module and updated dependencies.**
 
 

diff --git a/pom.xml b/pom.xml
@@ -75,6 +75,7 @@
         <undertow.version>2.1.0.Final</undertow.version>
         <woodstox.version>6.0.3</woodstox.version>
 
+        <micrometer-core.version>1.6.2</micrometer-core.version>
     </properties>
 
 
@@ -101,6 +102,13 @@
             <scope>test</scope>
         </dependency>
 
+                <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <version>${micrometer-core.version}</version>
+        </dependency>
+
+
     </dependencies>
 
 

diff --git a/proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java b/proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java
@@ -46,6 +46,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -110,10 +111,8 @@ public class ProteusApplication {
 
     public ProteusApplication()
     {
-
         injector = Guice.createInjector(new ConfigModule());
         injector.injectMembers(this);
-
     }
 
     public ProteusApplication(String configFile)
@@ -132,6 +131,15 @@ public ProteusApplication(URL configURL)
 
     }
 
+    public ProteusApplication(Module ... modules)
+    {
+
+        injector = Guice.createInjector(modules);
+        injector.injectMembers(this);
+
+    }
+
+
     public void start()
     {
 

diff --git a/proteus-core/src/main/java/io/sinistral/proteus/protocol/MediaType.java b/proteus-core/src/main/java/io/sinistral/proteus/protocol/MediaType.java
@@ -970,7 +970,7 @@ public class MediaType
     public static final MediaType IMAGE_G3FAX = create("image/g3fax", "g3");
     public static final MediaType IMAGE_GIF = create("image/gif", "gif");
     public static final MediaType IMAGE_IEF = create("image/ief", "ief");
-    public static final MediaType IMAGE_JPEG = create("image/jpeg", "jpeg", "jpg", "jpe");
+    public static final MediaType IMAGE_JPEG = create("image/jpeg",  "jpg","jpeg", "jpe");
     public static final MediaType IMAGE_JBIG = create("image/jbig", "jbig", "jbg");
     public static final MediaType IMAGE_KTX = create("image/ktx", "ktx");
     public static final MediaType IMAGE_PCX = create("image/pcx", "pcx");

diff --git a/proteus-core/src/main/resources/reference.conf b/proteus-core/src/main/resources/reference.conf
@@ -33,6 +33,10 @@ application {
   services {
     timeout = 2 minutes
   }
+
+  shutdown {
+    timeout = 10 seconds
+  }
 
 }