From 1c412d1907b4cbaa6645aa08f5af073dbffb59b3 Mon Sep 17 00:00:00 2001
From: Ken-ichi Mito <mitty@mitty.jp>
Date: Sun, 5 Mar 2017 00:19:58 +0900
Subject: [PATCH] refactor: code of areastack option is hard to understand

- reviewed on https://github.com/munin-monitoring/contrib/pull/738#pullrequestreview-5187474
- split two conditional branches to simple if-else code
---
 plugins/lxc/lxc_ram | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/lxc/lxc_ram b/plugins/lxc/lxc_ram
index c0437341..4208f875 100755
--- a/plugins/lxc/lxc_ram
+++ b/plugins/lxc/lxc_ram
@@ -78,16 +78,10 @@ if [ "$1" = "config" ]; then
     echo 'mem_usage_'$guest'.type GAUGE'
     echo 'mem_usage_'$guest'.draw AREASTACK'
   done
- fi
+  
+  for guest_name in $guest_names; do
+    guest="$(clean_fieldname $guest_name)"
 
- for guest_name in $guest_names;
-  do
-   guest="$(clean_fieldname $guest_name)"
-
-   if [ "$areastack" != "true" ]; then
-    echo 'mem_usage_'$guest'.label '$guest_name': Mem usage'
-    echo 'mem_usage_'$guest'.type GAUGE'
-   fi
    echo 'mem_cache_'$guest'.label '$guest_name': Cache'
    echo 'mem_cache_'$guest'.type GAUGE'
    echo 'mem_active_'$guest'.label '$guest_name': Active'
@@ -96,6 +90,22 @@ if [ "$1" = "config" ]; then
    echo 'mem_inactive_'$guest'.type GAUGE'
 
   done
+ else
+  for guest_name in $guest_names;
+   do
+    guest="$(clean_fieldname $guest_name)"
+
+    echo 'mem_usage_'$guest'.label '$guest_name': Mem usage'
+    echo 'mem_usage_'$guest'.type GAUGE'
+    echo 'mem_cache_'$guest'.label '$guest_name': Cache'
+    echo 'mem_cache_'$guest'.type GAUGE'
+    echo 'mem_active_'$guest'.label '$guest_name': Active'
+    echo 'mem_active_'$guest'.type GAUGE'
+    echo 'mem_inactive_'$guest'.label '$guest_name': Inactive'
+    echo 'mem_inactive_'$guest'.type GAUGE'
+
+   done
+ fi
  
  exit 0
 fi