Merge pull request #1204 from monicasarbu/small_fixes

Solve panic in topbeat
elastic · Mar 22, 2016 · 74e6487 · 74e6487
2 parents 5827b44 + cc8c382
commit 74e6487
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/topbeat/system/process.go b/topbeat/system/process.go
@@ -139,7 +139,7 @@ func GetProcessEvent(process *Process, last *Process) common.MapStr {
 
 func GetProcCpuPercentage(last *Process, current *Process) float64 {
 
-	if last != nil {
+	if last != nil && current != nil {
 
 		delta_proc := (current.Cpu.User - last.Cpu.User) + (current.Cpu.Sys - last.Cpu.Sys)
 		delta_time := current.Ctime.Sub(last.Ctime).Nanoseconds() / 1e6 // in milliseconds