Projet

Général

Profil

Révision 1c412d19

ID1c412d1907b4cbaa6645aa08f5af073dbffb59b3
Parent 58e5b2f3
Enfant 9f7e0614

Ajouté par Ken-ichi Mito il y a plus de 8 ans

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

Voir les différences:

plugins/lxc/lxc_ram
78 78
    echo 'mem_usage_'$guest'.type GAUGE'
79 79
    echo 'mem_usage_'$guest'.draw AREASTACK'
80 80
  done
81
 fi
82

  
83
 for guest_name in $guest_names;
84
  do
85
   guest="$(clean_fieldname $guest_name)"
81
  
82
  for guest_name in $guest_names; do
83
    guest="$(clean_fieldname $guest_name)"
86 84

  
87
   if [ "$areastack" != "true" ]; then
88
    echo 'mem_usage_'$guest'.label '$guest_name': Mem usage'
89
    echo 'mem_usage_'$guest'.type GAUGE'
90
   fi
91 85
   echo 'mem_cache_'$guest'.label '$guest_name': Cache'
92 86
   echo 'mem_cache_'$guest'.type GAUGE'
93 87
   echo 'mem_active_'$guest'.label '$guest_name': Active'
......
96 90
   echo 'mem_inactive_'$guest'.type GAUGE'
97 91

  
98 92
  done
93
 else
94
  for guest_name in $guest_names;
95
   do
96
    guest="$(clean_fieldname $guest_name)"
97

  
98
    echo 'mem_usage_'$guest'.label '$guest_name': Mem usage'
99
    echo 'mem_usage_'$guest'.type GAUGE'
100
    echo 'mem_cache_'$guest'.label '$guest_name': Cache'
101
    echo 'mem_cache_'$guest'.type GAUGE'
102
    echo 'mem_active_'$guest'.label '$guest_name': Active'
103
    echo 'mem_active_'$guest'.type GAUGE'
104
    echo 'mem_inactive_'$guest'.label '$guest_name': Inactive'
105
    echo 'mem_inactive_'$guest'.type GAUGE'
106

  
107
   done
108
 fi
99 109
 
100 110
 exit 0
101 111
fi

Formats disponibles : Unified diff