Revision 69b99987 lib/ssconf.py

b/lib/ssconf.py
57 57
    self._last_inode = None
58 58
    self._last_mtime = None
59 59
    self._last_size = None
60

  
61
    self._config_data = None
62
    self._instances_ips = None
63
    self._inst_ips_by_link = None
64
    self._ip_to_instance = None
65
    self._mc_primary_ips = None
66
    self._nodes_primary_ips = None
67

  
60 68
    # we need a forced reload at class init time, to initialize _last_*
61 69
    self._Load(force=True)
62 70

  
......
79 87
    mtime = cfg_stat.st_mtime
80 88
    size = cfg_stat.st_size
81 89

  
82
    reload = False
83
    if force or inode != self._last_inode or \
84
       mtime > self._last_mtime or \
85
       size != self._last_size:
90
    if (force or inode != self._last_inode or
91
        mtime > self._last_mtime or
92
        size != self._last_size):
86 93
      self._last_inode = inode
87 94
      self._last_mtime = mtime
88 95
      self._last_size = size
89
      reload = True
90

  
91
    if not reload:
96
    else:
97
      # Don't reload
92 98
      return False
93 99

  
94 100
    try:

Also available in: Unified diff