Browse Source

Merge branch 'python' of github.com:rtCamp/easyengine into python

bugfixes
harshadyeola 10 years ago
parent
commit
c56f1bd564
  1. 2
      ee/cli/plugins/stack.py
  2. 5
      ee/core/mysql.py

2
ee/cli/plugins/stack.py

@ -90,7 +90,7 @@ class EEStackController(CementBaseController):
Log.debug(self, 'Adding key for {0}' Log.debug(self, 'Adding key for {0}'
.format(EEVariables.ee_mysql_repo)) .format(EEVariables.ee_mysql_repo))
EERepo.add_key(self, '1C4CBDCDCD2EFD2A', EERepo.add_key(self, '1C4CBDCDCD2EFD2A',
keyserver="http://keyserver.ubuntu.com:80") keyserver="keyserver.ubuntu.com")
chars = ''.join(random.sample(string.ascii_letters, 8)) chars = ''.join(random.sample(string.ascii_letters, 8))
Log.debug(self, "Pre-seeding MySQL") Log.debug(self, "Pre-seeding MySQL")
EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 " EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 "

5
ee/core/mysql.py

@ -48,6 +48,9 @@ class EEMysql():
.format(statement)) .format(statement))
cur.execute(statement) cur.execute(statement)
cur.close()
conn.close()
except Exception as e: except Exception as e:
cur.close() cur.close()
conn.close() conn.close()
@ -57,8 +60,6 @@ class EEMysql():
else: else:
Log.error(self, '{0}'.format(errormsg)) Log.error(self, '{0}'.format(errormsg))
cur.close()
conn.close()
# def __del__(self): # def __del__(self):
# self.cur.close() # self.cur.close()

Loading…
Cancel
Save