Refactor the for loop a little to be less complicatedsql-install-race

1 files changed, 4 insertions, 9 deletions

diff --git a/reactive/grafana.py b/reactive/grafana.py
index 9235ee4..8b3b126 100644
--- a/reactive/grafana.py
+++ b/reactive/grafana.py
@@ -452,18 +452,13 @@ def check_adminuser():
 conn = sqlite3.connect('/var/lib/grafana/grafana.db', timeout=30)
 cur = conn.cursor()
 # Check if we have more than one user in the db
- found = False
 for x in range(0, 5):
- if found:
- break
 hookenv.log("Checking for existing users, loop %d of 6" % (x + 1))
 time.sleep(5)
- usercount = cur.execute('SELECT count(login) from user')
- for row in usercount.fetchall():
- if row[0] > 0:
- found = True
- break
-
+ results = cur.execute('SELECT count(login) from user')
+ usercount = results.fetchall()[0][0]
+ if usercount > 0:
+ break
 else:
 hookenv.log("We didn't find any users!")
 return