activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/7] activemq-artemis git commit: added log message to show jolkia path when available, also added a logger
Date Wed, 23 Dec 2015 16:00:24 GMT
added log message to show jolkia path when available, also added a logger


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6e7ed234
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6e7ed234
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6e7ed234

Branch: refs/heads/master
Commit: 6e7ed2348f97d703d87afeaccaf5766eb6740d90
Parents: 3ef184a
Author: Andy Taylor <andy.tayls67@gmail.com>
Authored: Tue Dec 22 14:49:11 2015 +0000
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed Dec 23 10:58:44 2015 -0500

----------------------------------------------------------------------
 .../cli/commands/etc/bootstrap-web-settings.txt |  2 +-
 artemis-web/pom.xml                             | 14 ++++-
 .../activemq/artemis/ActiveMQWebLogger.java     | 55 ++++++++++++++++++++
 .../artemis/component/WebServerComponent.java   | 14 +++--
 4 files changed, 80 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e7ed234/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
index 66468dc..4ea400a 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
@@ -1,4 +1,4 @@
    <!-- The web server is only bound to loalhost by default -->
    <web bind="http://localhost:${http.port}" path="web">
-       <app url="jolokia" war="jolokia-war-1.3.1.war"/>
+       <app url="jolokia" war="jolokia-war-1.3.2.war"/>
    </web>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e7ed234/artemis-web/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml
index 0036624..af09fa1 100644
--- a/artemis-web/pom.xml
+++ b/artemis-web/pom.xml
@@ -33,6 +33,12 @@
 
    <dependencies>
       <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-dto</artifactId>
          <version>${project.version}</version>
@@ -64,7 +70,13 @@
          <version>${project.version}</version>
       </dependency>
 
-
+      <!--
+         JBoss Logging
+     -->
+     <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+     </dependency>
    </dependencies>
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e7ed234/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java
----------------------------------------------------------------------
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java
b/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java
new file mode 100644
index 0000000..4200955
--- /dev/null
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/ActiveMQWebLogger.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.activemq.artemis;
+
+import org.jboss.logging.BasicLogger;
+import org.jboss.logging.Logger;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
+
+/**
+ * Logger Code 24
+ *
+ * each message id must be 6 digits long starting with 18, the 3rd digit donates the level
so
+ *
+ * INF0  1
+ * WARN  2
+ * DEBUG 3
+ * ERROR 4
+ * TRACE 5
+ * FATAL 6
+ *
+ * so an INFO message would be 181000 to 181999
+ */
+@MessageLogger(projectCode = "AMQ")
+public interface ActiveMQWebLogger extends BasicLogger {
+
+   /**
+    * The aerogear logger.
+    */
+   ActiveMQWebLogger LOGGER = Logger.getMessageLogger(ActiveMQWebLogger.class, ActiveMQWebLogger.class.getPackage().getName());
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 241001, value = "HTTP Server started at {0}", format = Message.Format.MESSAGE_FORMAT)
+   void webserverStarted(String bind);
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 241002, value = "Artemis Jolokia REST API available at {0}", format = Message.Format.MESSAGE_FORMAT)
+   void jolokiaAvailable(String bind);
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e7ed234/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
----------------------------------------------------------------------
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index 23fa462..05bf7fd 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.component;
 
 import java.net.URI;
 
+import org.apache.activemq.artemis.ActiveMQWebLogger;
 import org.apache.activemq.artemis.components.ExternalComponent;
 import org.apache.activemq.artemis.dto.AppDTO;
 import org.apache.activemq.artemis.dto.ComponentDTO;
@@ -35,12 +36,14 @@ public class WebServerComponent implements ExternalComponent {
    private Server server;
    private HandlerList handlers;
    private WebServerDTO webServerConfig;
+   private URI uri;
+   private String jolokiaUrl;
 
    @Override
    public void configure(ComponentDTO config, String artemisInstance, String artemisHome)
throws Exception {
       webServerConfig = (WebServerDTO) config;
       String path = webServerConfig.path.startsWith("/") ? webServerConfig.path : "/" + webServerConfig.path;
-      URI uri = new URI(webServerConfig.bind);
+      uri = new URI(webServerConfig.bind);
       server = new Server();
       ServerConnector connector = new ServerConnector(server);
       connector.setPort(uri.getPort());
@@ -53,6 +56,9 @@ public class WebServerComponent implements ExternalComponent {
       if (webServerConfig.apps != null) {
          for (AppDTO app : webServerConfig.apps) {
             deployWar(app.url, app.war, artemisHome, path);
+            if (app.war.startsWith("jolokia")) {
+               jolokiaUrl = webServerConfig.bind + "/" + app.url;
+            }
          }
       }
 
@@ -77,8 +83,10 @@ public class WebServerComponent implements ExternalComponent {
    @Override
    public void start() throws Exception {
       server.start();
-
-      System.out.println("HTTP Server started at " + webServerConfig.bind);
+      ActiveMQWebLogger.LOGGER.webserverStarted(webServerConfig.bind);
+      if (jolokiaUrl != null) {
+         ActiveMQWebLogger.LOGGER.jolokiaAvailable(jolokiaUrl);
+      }
    }
 
    @Override


Mime
View raw message