Remove daemon thread change, add default for ssl in reference.conf

logzio · Mar 2, 2022 · e2bb461 · e2bb461
1 parent 8939391
commit e2bb461
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/main/java/io/logz/jmx2graphite/Jmx2Graphite.java b/src/main/java/io/logz/jmx2graphite/Jmx2Graphite.java
@@ -28,15 +28,10 @@ public class Jmx2Graphite {
     private final MBeanClient client;
 
     public Jmx2Graphite(Jmx2GraphiteConfiguration conf) {
-        this(conf, false);
-    }
-
-    public Jmx2Graphite(Jmx2GraphiteConfiguration conf, boolean runAsDaemon) {
         this.conf = conf;
 
         ThreadFactory threadFactory = new ThreadFactoryBuilder()
                 .setNameFormat("Jmx2GraphiteSender-%d")
-                .setDaemon(runAsDaemon)
                 .build();
         this.taskScheduler = new ScheduledThreadPoolExecutor(1, threadFactory);
 

diff --git a/src/main/java/io/logz/jmx2graphite/Jmx2GraphiteJavaAgent.java b/src/main/java/io/logz/jmx2graphite/Jmx2GraphiteJavaAgent.java
@@ -38,7 +38,7 @@ public static void premain(String agentArgument, Instrumentation instrumentation
 
         Jmx2GraphiteConfiguration jmx2GraphiteConfiguration = new Jmx2GraphiteConfiguration(finalConfig);
 
-        Jmx2Graphite main = new Jmx2Graphite(jmx2GraphiteConfiguration, true);
+        Jmx2Graphite main = new Jmx2Graphite(jmx2GraphiteConfiguration);
         logger.info("Initiated new java agent based Jmx2Graphite instance");
 
         try {

diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
@@ -4,4 +4,5 @@ graphite {
     port = 2004
     connectTimeout = 10
     socketTimeout = 5
+    ssl = false
 }