server: fix system account create logs Don't output scary message, avoid logging network_group table not found and log sane messages if system/admin account/user already exist.
Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5599dee9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5599dee9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5599dee9 Branch: refs/heads/4.5 Commit: 5599dee90d0ae84d80089b44696a891ae48ecec0 Parents: 43db75c Author: Rohit Yadav <[email protected]> Authored: Mon Apr 13 15:30:43 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Mon Apr 13 15:44:09 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/ConfigurationServerImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5599dee9/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index b85f137..f2c2eda 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -470,7 +470,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Caught exception when inserting system account: " + ex.getMessage()); + s_logger.debug("Looks like system account already exists"); } // insert system user insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, user.default)" @@ -480,7 +480,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Caught SQLException when inserting system user: " + ex.getMessage()); + s_logger.debug("Looks like system user already exists"); } // insert admin user, but leave the account disabled until we set a @@ -497,7 +497,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Caught SQLException when creating admin account: " + ex.getMessage()); + s_logger.debug("Looks like admin account already exists"); } // now insert the user @@ -508,7 +508,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Caught SQLException when inserting admin user: " + ex.getMessage()); + s_logger.debug("Looks like admin user already exists"); } try { @@ -519,8 +519,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio stmt.executeQuery(); tableName = "network_group"; } catch (Exception ex) { - // if network_groups table exists, create the default security group there - s_logger.debug("Caught (SQL?)Exception: no network_group " + ex.getLocalizedMessage()); + // Ignore in case of exception, table must not exist } insertSql = "SELECT * FROM " + tableName + " where account_id=2 and name='default'";
