Add installation_source configuration setting and log it on startup

Closes #1530 (cherry picked from commit 5d6169c)
Graylog2 · Nov 11, 2015 · 59babe0 · 59babe0
1 parent 99d3e24
commit 59babe0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/graylog2-bootstrap/src/main/java/org/graylog2/bootstrap/ServerBootstrap.java b/graylog2-bootstrap/src/main/java/org/graylog2/bootstrap/ServerBootstrap.java
@@ -74,7 +74,8 @@ public boolean isNoPidFile() {
 
     @Override
     protected void startCommand() {
-        LOG.info("Graylog " + commandName + " {} starting up. (JRE: {})", version, Tools.getSystemInformation());
+        LOG.info("Graylog {} {} starting up (JRE: {}, installed from: {})", commandName, version,
+                Tools.getSystemInformation(), configuration.getInstallationSource());
 
         // Do not use a PID file if the user requested not to
         if (!isNoPidFile()) {

diff --git a/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/BaseConfiguration.java b/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/BaseConfiguration.java
@@ -27,6 +27,7 @@
 import com.github.joschi.jadconfig.validators.InetPortValidator;
 import com.github.joschi.jadconfig.validators.PositiveDurationValidator;
 import com.github.joschi.jadconfig.validators.PositiveIntegerValidator;
+import com.github.joschi.jadconfig.validators.StringNotBlankValidator;
 import com.lmax.disruptor.BlockingWaitStrategy;
 import com.lmax.disruptor.BusySpinWaitStrategy;
 import com.lmax.disruptor.SleepingWaitStrategy;
@@ -131,6 +132,9 @@ public abstract class BaseConfiguration {
     @Parameter(value = "http_read_timeout", validator = PositiveDurationValidator.class)
     private Duration httpReadTimeout = Duration.seconds(10L);
 
+    @Parameter(value = "installation_source", validator = StringNotBlankValidator.class)
+    private String installationSource = "unknown";
+
     public String getRestUriScheme() {
         return isRestEnableTls() ? "https" : "http";
     }
@@ -305,4 +309,8 @@ public Duration getHttpWriteTimeout() {
     public Duration getHttpReadTimeout() {
         return httpReadTimeout;
     }
+
+    public String getInstallationSource() {
+        return installationSource;
+    }
 }