[release] v0.12.0-unstable3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.12.0-unstable2",
+  "version": "0.12.0-unstable3",
   "description": "",
   "main": "test-server.js",
   "bugs": {

src/docker/docker.go

@@ -683,6 +683,11 @@ func StatsAll() ([]ContainerStats, error) {
 	var containerStatsList []ContainerStats
 
 	for _, container := range containers {
+		// if running
+		if container.State != "running" {
+			continue
+		}
+		
 		statsBody, err := DockerClient.ContainerStatsOneShot(DockerContext, container.ID)
 		if err != nil {
 			return nil, fmt.Errorf("error fetching stats for container %s: %s", container.ID, err)
@@ -703,7 +708,7 @@ func StatsAll() ([]ContainerStats, error) {
 		if systemDelta > 0 && cpuDelta > 0 {
 			cpuUsage = (cpuDelta / systemDelta) * float64(len(stats.CPUStats.CPUUsage.PercpuUsage)) * 100
 		} else {
-			utils.Error("StatsAll - Error calculating CPU usage", nil)
+			utils.Error("StatsAll - Error calculating CPU usage for " + container.Names[0], nil)
 		}
 
 		// memUsage := float64(stats.MemoryStats.Usage) / float64(stats.MemoryStats.Limit) * 100

src/metrics/system.go

@@ -124,14 +124,13 @@ func GetSystemMetrics() {
   for _, part := range parts {
     u, err := disk.Usage(part.Mountpoint)
 		if err != nil {
-			utils.Error("Metrics - Error fetching Disk usage:", err)
-			return
+			utils.Error("Metrics - Error fetching Disk usage for " + part.Mountpoint + " : ", err)
+		} else {
+			PushSetMetric("system.disk." + part.Mountpoint, int(u.Used), DataDef{
+				Max: u.Total,
+				Period: time.Second * 120,
+				Label: "Disk " + part.Mountpoint,
+			})
 		}
-		
-		PushSetMetric("system.disk." + part.Mountpoint, int(u.Used), DataDef{
-			Max: u.Total,
-			Period: time.Second * 120,
-			Label: "Disk " + part.Mountpoint,
-		})
   }
 }