From 85a0257d4835583d15327eceeaf19ae1e45e994c Mon Sep 17 00:00:00 2001 From: Nikita Date: Mon, 1 Feb 2016 17:35:44 +0300 Subject: [PATCH] Version logging added --- src/main/java/org/redisson/Version.java | 51 +++++++++++++++++++ .../MasterSlaveConnectionManager.java | 3 ++ 2 files changed, 54 insertions(+) create mode 100644 src/main/java/org/redisson/Version.java diff --git a/src/main/java/org/redisson/Version.java b/src/main/java/org/redisson/Version.java new file mode 100644 index 000000000..76474c725 --- /dev/null +++ b/src/main/java/org/redisson/Version.java @@ -0,0 +1,51 @@ +/** + * Copyright 2014 Nikita Koksharov, Nickolay Borbit + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.redisson; + +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; +import java.util.jar.Attributes; +import java.util.jar.Manifest; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Version { + + private static final Logger log = LoggerFactory.getLogger(Version.class); + + public static void logVersion() { + try { + Enumeration resources = Version.class.getClassLoader().getResources("META-INF/MANIFEST.MF"); + while (resources.hasMoreElements()) { + Manifest manifest = new Manifest(resources.nextElement().openStream()); + Attributes attrs = manifest.getMainAttributes(); + if (attrs == null) { + continue; + } + String name = attrs.getValue("Bundle-Name"); + if (name != null && name.equals("Redisson")) { + log.info("Redisson " + attrs.getValue("Bundle-Version")); + break; + } + } + } catch (IOException E) { + // skip it + } + } + +} diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 2a1e4ea24..b96c1d283 100644 --- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -32,6 +32,7 @@ import org.redisson.BaseMasterSlaveServersConfig; import org.redisson.Config; import org.redisson.MasterSlaveServersConfig; import org.redisson.ReadMode; +import org.redisson.Version; import org.redisson.client.BaseRedisPubSubListener; import org.redisson.client.RedisClient; import org.redisson.client.RedisConnection; @@ -134,6 +135,8 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } public MasterSlaveConnectionManager(Config cfg) { + Version.logVersion(); + if (cfg.isUseLinuxNativeEpoll()) { if (cfg.getEventLoopGroup() == null) { this.group = new EpollEventLoopGroup(cfg.getThreads());