You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2014/01/22 15:36:27 UTC
[1/2] git commit: KARAF-2691 Adding pid to session
Updated Branches:
refs/heads/karaf-2.x 99e69c3f8 -> bc7faa640
KARAF-2691 Adding pid to session
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ff1bf16d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ff1bf16d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ff1bf16d
Branch: refs/heads/karaf-2.x
Commit: ff1bf16dc7d66a513211cb5e919a33b46e490019
Parents: 99e69c3
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Jan 22 15:33:39 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Jan 22 15:33:39 2014 +0100
----------------------------------------------------------------------
.../apache/karaf/shell/console/jline/ConsoleFactory.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ff1bf16d/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
index 9ab6182..a7af22c 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
@@ -22,15 +22,18 @@ import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.lang.management.ManagementFactory;
import java.lang.reflect.Method;
import java.net.URL;
import java.security.KeyPair;
import java.nio.charset.Charset;
import java.security.PrivilegedExceptionAction;
import java.util.List;
+
import javax.security.auth.Subject;
import jline.Terminal;
+
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Function;
@@ -175,6 +178,7 @@ public class ConsoleFactory {
session.put("LC_CTYPE", ctype);
}
session.put(".jline.terminal", terminal);
+ session.put("pid", getPid());
registration = bundleContext.registerService(CommandSession.class, session, null);
@@ -185,6 +189,12 @@ public class ConsoleFactory {
new Thread(this.console, "Karaf Shell Console Thread").start();
}
}
+
+ private String getPid() {
+ String name = ManagementFactory.getRuntimeMXBean().getName();
+ String[] parts = name.split("@");
+ return parts[0];
+ }
protected void stop() throws Exception {
if (registration != null) {
[2/2] git commit: KARAF-2691 Adding pid to info command
Posted by cs...@apache.org.
KARAF-2691 Adding pid to info command
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bc7faa64
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bc7faa64
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bc7faa64
Branch: refs/heads/karaf-2.x
Commit: bc7faa6406ad7f4076ad0e7f1d720cd522b83c37
Parents: ff1bf16
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Jan 22 15:36:10 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Jan 22 15:36:10 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/commands/InfoAction.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bc7faa64/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
index 662ad8f..68b852d 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/InfoAction.java
@@ -75,6 +75,7 @@ public class InfoAction extends OsgiCommandSupport {
printValue("Java Virtual Machine", maxNameLen, runtime.getVmName() + " version " + runtime.getVmVersion());
printValue("Version", maxNameLen, System.getProperty("java.version"));
printValue("Vendor", maxNameLen, runtime.getVmVendor());
+ printValue("Pid", maxNameLen, getPid());
printValue("Uptime", maxNameLen, printDuration(runtime.getUptime()));
try {
printValue("Process CPU time", maxNameLen, printDuration(getSunOsValueAsLong(os, "getProcessCpuTime") / 1000000));
@@ -150,6 +151,12 @@ public class InfoAction extends OsgiCommandSupport {
return null;
}
+
+ private String getPid() {
+ String name = ManagementFactory.getRuntimeMXBean().getName();
+ String[] parts = name.split("@");
+ return parts[0];
+ }
private long getSunOsValueAsLong(OperatingSystemMXBean os, String name) throws Exception {
Method mth = os.getClass().getMethod(name);