Merge branch 'master' of github.com:PecanProject/pecan

benda1997 · Jun 30, 2013 · e7b8096 · e7b8096
2 parents 41fa405 + bb92de3
commit e7b8096
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/settings/R/read.settings.R b/settings/R/read.settings.R
@@ -68,16 +68,6 @@ check.settings <- function(settings) {
   # PostgreSQL specific checks
   # TODO IMPLEMENT
 
-  # check if we can connect to the database
-  require(PEcAn.DB)
-  if (!db.exists(params=settings$database, write=settings$bety$write)) {
-    logger.warn("Could not connect to the database.")
-    database <- FALSE
-  } else {
-    logger.info("Successfully connected to database")
-    database <- TRUE
-  }
-
   # should runs be written to database
   if (is.null(settings$bety$write)) {
     logger.info("Writing all runs/configurations to database.")
@@ -91,6 +81,16 @@ check.settings <- function(settings) {
     }
   }
 
+  # check if we can connect to the database
+  require(PEcAn.DB)
+  if (!db.exists(params=settings$database, write=settings$bety$write)) {
+    logger.warn("Could not connect to the database.")
+    database <- FALSE
+  } else {
+    logger.info("Successfully connected to database")
+    database <- TRUE
+  }
+
   # TODO check userid and userpassword
 
   # check database version