From 458e99c73bc9f741552014dc5927070553fcc09a Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 2 Jul 2021 15:42:32 +0200
Subject: Add printing of app information from MANIFEST.MF
---
pom.xml | 37 ++++++++++++++++++++++++--
src/main/java/org/openslx/imagemaster/App.java | 9 ++++---
2 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 993cae3..02b4cd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,10 +8,15 @@
jar
image-master
- http://maven.apache.org
+ https://git.openslx.org/bwlp/masterserver.git/
+
+
+ scm:git:git://git.openslx.org/bwlp/masterserver.git
+
UTF-8
+ org.openslx.imagemaster.App
@@ -78,6 +83,27 @@
+
+ org.codehaus.mojo
+ buildnumber-maven-plugin
+ 1.4
+
+
+ package
+
+ create
+
+
+
+
+ false
+ false
+ UTC
+ build.time
+ revision.branch
+ revision.version
+
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -111,8 +137,15 @@
- org.openslx.imagemaster.App
+ ${main.class}
+ true
+ true
+
+ ${build.time}
+ ${revision.branch}
+ ${revision.version}
+
jar-with-dependencies
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index 6b68770..f9b5399 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -13,6 +13,7 @@ import org.apache.thrift.transport.TTransportException;
import org.openslx.imagemaster.localrpc.NetworkHandler;
import org.openslx.imagemaster.thrift.server.BinaryListener;
import org.openslx.sat.thrift.version.Version;
+import org.openslx.util.AppUtil;
/**
* The main class that starts all the services.
@@ -22,6 +23,8 @@ public class App
private static Logger log = Logger.getLogger( App.class );
+ private static final String NAME = "Master-Server";
+
private static List servers = new ArrayList<>();
public static void main( String[] args ) throws TTransportException, NoSuchAlgorithmException, SocketException
@@ -31,10 +34,8 @@ public class App
BasicConfigurator.configure();
}
- log.info( "****************************************************************" );
- log.info( "******************* Starting Application ***********************" );
- log.info( "****************************************************************" );
- log.info( "RPC version " + Version.VERSION );
+ AppUtil.logHeader( log, App.NAME, App.class.getPackage().getImplementationVersion() );
+ AppUtil.logProperty( log, "rpc.version", Long.toString( Version.VERSION ) );
// Create binary listener
Thread t;
--
cgit v1.2.3-55-g7522