Revision 1eacf6a2 lib/watcher/state.py

b/lib/watcher/state.py
158 158

  
159 159
    """
160 160
    idata = self._data["instance"]
161

  
162
    if instance_name in idata:
163
      return idata[instance_name][KEY_RESTART_COUNT]
164

  
165
    return 0
161
    return idata.get(instance_name, {}).get(KEY_RESTART_COUNT, 0)
166 162

  
167 163
  def NumberOfCleanupAttempts(self, instance_name):
168 164
    """Returns number of previous cleanup attempts.
......
172 168

  
173 169
    """
174 170
    idata = self._data["instance"]
175

  
176
    if instance_name in idata:
177
      return idata[instance_name][KEY_CLEANUP_COUNT]
178

  
179
    return 0
171
    return idata.get(instance_name, {}).get(KEY_CLEANUP_COUNT, 0)
180 172

  
181 173
  def MaintainInstanceList(self, instances):
182 174
    """Perform maintenance on the recorded instances.

Also available in: Unified diff