[Hyperic-hq-discuss] hq r3903 - trunk/plugins/system/src/org/hyperic/hq/plugin/system

[<do...@hy...>]

Author: dougm
Date: 2007-03-25 18:38:07 -0800 (Sun, 25 Mar 2007)
New Revision: 3903
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3903

Modified:
   trunk/plugins/system/src/org/hyperic/hq/plugin/system/ProcessDetailData.java
   trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java
Log:
require pid for process command

Modified: trunk/plugins/system/src/org/hyperic/hq/plugin/system/ProcessDetailData.java
===================================================================
--- trunk/plugins/system/src/org/hyperic/hq/plugin/system/ProcessDetailData.java	2007-03-26 02:18:16 UTC (rev 3902)
+++ trunk/plugins/system/src/org/hyperic/hq/plugin/system/ProcessDetailData.java	2007-03-26 02:38:07 UTC (rev 3903)
@@ -87,19 +87,6 @@
         return data;
     }
 
-    public static ProcessData gather(Sigar sigar, String pid)
-        throws SigarException {
-    
-        long id;
-        try {
-            id = Long.parseLong(pid);
-        } catch (NumberFormatException e) {
-            throw new SigarException("Invalid pid: " + pid);
-        }
-
-        return gather(sigar, id);
-    }
-
     public String[] getProcArgs() {
         return _procArgs;
     }

Modified: trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java
===================================================================
--- trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java	2007-03-26 02:18:16 UTC (rev 3902)
+++ trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java	2007-03-26 02:38:07 UTC (rev 3903)
@@ -96,14 +96,7 @@
                     config.getValue(SigarMeasurementPlugin.PTQL_CONFIG);
                 return TopData.gather(sigar, filter);
             } else if (command.equals(CMD_PROCESS)) {
-                String pid =
-                    config.getValue(PROP_PID);
-                if (pid == null) {
-                    //throw new PluginException("Missing " + PROP_PID);
-                    //XXX default to our own pid for testing.
-                    return ProcessDetailData.gather(sigar, sigar.getPid());
-                }
-                return ProcessDetailData.gather(sigar, pid);
+                return ProcessDetailData.gather(sigar, getPid(config));
             } else if (command.equals(CMD_KILL)) {
                 String signame = config.getValue(PROP_SIGNAL);
                 if (signame == null) {