Fix uptime metric in passenger input plugin (#3871)
This commit is contained in:
parent
314630271d
commit
6a1f5767bb
|
@ -102,7 +102,7 @@ func (p *process) getUptime() int64 {
|
||||||
uptime += value * (24 * 60 * 60)
|
uptime += value * (24 * 60 * 60)
|
||||||
}
|
}
|
||||||
case strings.HasSuffix(v, "h"):
|
case strings.HasSuffix(v, "h"):
|
||||||
iValue := strings.TrimSuffix(v, "y")
|
iValue := strings.TrimSuffix(v, "h")
|
||||||
value, err := strconv.ParseInt(iValue, 10, 64)
|
value, err := strconv.ParseInt(iValue, 10, 64)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
uptime += value * (60 * 60)
|
uptime += value * (60 * 60)
|
||||||
|
|
|
@ -126,7 +126,7 @@ func TestPassengerGenerateMetric(t *testing.T) {
|
||||||
"spawn_start_time": int64(1452746844946982),
|
"spawn_start_time": int64(1452746844946982),
|
||||||
"spawn_end_time": int64(1452746845013365),
|
"spawn_end_time": int64(1452746845013365),
|
||||||
"last_used": int64(1452747071764940),
|
"last_used": int64(1452747071764940),
|
||||||
"uptime": int64(226), // in seconds of 3m 46s
|
"uptime": int64(191026), // in seconds of 2d 5h 3m 46s
|
||||||
"cpu": int64(58),
|
"cpu": int64(58),
|
||||||
"rss": int64(418548),
|
"rss": int64(418548),
|
||||||
"pss": int64(319391),
|
"pss": int64(319391),
|
||||||
|
@ -219,7 +219,7 @@ var sampleStat = `
|
||||||
<spawn_end_time>1452746845013365</spawn_end_time>
|
<spawn_end_time>1452746845013365</spawn_end_time>
|
||||||
<last_used>1452747071764940</last_used>
|
<last_used>1452747071764940</last_used>
|
||||||
<last_used_desc>0s ago</last_used_desc>
|
<last_used_desc>0s ago</last_used_desc>
|
||||||
<uptime>3m 46s</uptime>
|
<uptime>2d 5h 3m 46s</uptime>
|
||||||
<code_revision>899ac7f</code_revision>
|
<code_revision>899ac7f</code_revision>
|
||||||
<life_status>ALIVE</life_status>
|
<life_status>ALIVE</life_status>
|
||||||
<enabled>ENABLED</enabled>
|
<enabled>ENABLED</enabled>
|
||||||
|
@ -263,7 +263,7 @@ var sampleStat = `
|
||||||
<spawn_end_time>1452746845172460</spawn_end_time>
|
<spawn_end_time>1452746845172460</spawn_end_time>
|
||||||
<last_used>1452747071709179</last_used>
|
<last_used>1452747071709179</last_used>
|
||||||
<last_used_desc>0s ago</last_used_desc>
|
<last_used_desc>0s ago</last_used_desc>
|
||||||
<uptime>3m 46s</uptime>
|
<uptime>2d 5h 3m 46s</uptime>
|
||||||
<code_revision>899ac7f</code_revision>
|
<code_revision>899ac7f</code_revision>
|
||||||
<life_status>ALIVE</life_status>
|
<life_status>ALIVE</life_status>
|
||||||
<enabled>ENABLED</enabled>
|
<enabled>ENABLED</enabled>
|
||||||
|
|
Loading…
Reference in New Issue