1 files changed, 17 insertions, 5 deletions

diff --git a/src/godo.go b/listener/godo.go
index a30aa88..efe9585 100644
--- a/src/godo.go
+++ b/listener/godo.go
@@ -128,7 +128,7 @@ func procWatch() error {
                                         tag:         PIDEXIT,
                                         timestamp:   time.Now(),
                                         pid:         int(data.ProcessPid),
-                                        exit_code:   uint64(data.ExitCode),
+                                        exit_code:   int(data.ExitCode),
                                         exit_signal: int(data.ExitSignal),
                                 }
                                 cookedChan <- cooked
@@ -139,8 +139,8 @@ func procWatch() error {
 }
 
 func checkProc(pCooked *Event) {
-        fileName := fmt.Sprintf("/proc/%d/task/%d/cmdline", pCooked.tgid, pCooked.pid)
-        fd, err := os.Open(fileName)
+        fileName := fmt.Sprintf("/proc/%d/task/%d/", pCooked.tgid, pCooked.pid)
+        fd, err := os.Open(fileName + "cmdline")
         if err != nil {
                 fmt.Fprintf(os.Stderr, "Err: %v\n", err)
                 return
@@ -155,8 +155,20 @@ func checkProc(pCooked *Event) {
         pCooked.argc = len(pCooked.argv)
         fd.Close()
 
-        fileName = fmt.Sprintf("/proc/%d/task/%d/cwd", pCooked.tgid, pCooked.pid)
-        pCooked.cwd, err = os.Readlink(fileName)
+        fd, err = os.Open(fileName + "comm")
+        if err != nil {
+                fmt.Fprintf(os.Stderr, "Err: %v\n", err)
+                return
+        }
+        scanner = bufio.NewScanner(fd)
+        scanner.Split(bufio.ScanLines)
+        for scanner.Scan() {
+                line := scanner.Text()
+                pCooked.comm = line
+        }
+        fd.Close()
+
+        pCooked.cwd, err = os.Readlink(fileName + "cwd")
         if err != nil {
                 fmt.Fprintf(os.Stderr, "Err: %v\n", err)
                 pCooked.cwd = ""