Merge branch 'i269' into release-1.3

rundeck · Apr 29, 2011 · df4a027 · df4a027
2 parents 9925bbd + 72ab2f3
commit df4a027
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/core/src/java/com/dtolabs/rundeck/core/common/FrameworkProject.java b/core/src/java/com/dtolabs/rundeck/core/common/FrameworkProject.java
@@ -110,8 +110,12 @@ public FrameworkProject(final String name, final File basedir, final IFrameworkP
 
         final String resfilepath = getNodesResourceFilePath();
         File resfile= new File(resfilepath);
-        if(!resfile.isFile()){
-            generateResourcesFile(resfile);
+        if(!resfile.isFile() && shouldUpdateNodesResourceFile()) {
+            try {
+                updateNodesResourceFile();
+            } catch (UpdateUtils.UpdateException e) {
+                getLogger().error("Unable to retrieve resources file: " + e.getMessage());
+            }
         }
         initialize();
     }

diff --git a/core/src/java/com/dtolabs/rundeck/core/common/Nodes.java b/core/src/java/com/dtolabs/rundeck/core/common/Nodes.java
@@ -85,6 +85,7 @@ protected Nodes(final FrameworkProject project, final File nodesDataFile, final
         valid=false;
         if(!nodesFile.exists()){
             logger.warn("nodes resource file doesn't exist: " + nodesFile.getAbsolutePath());
+            valid=true;
         }else{
             final NodeFileParser parser = createParser(this.project, nodesFile);
             try {

diff --git a/docs/en/02-basics/02-chapter1.md b/docs/en/02-basics/02-chapter1.md
@@ -167,7 +167,7 @@ distinguished with the word "server" in red text.
 
 ### Resource model
 
-The initial resource model generated during project setup will contain
+The initial resource model will contain
 information just about the RunDeck server host and is useful just for
 running local commands on the RunDeck server. 
 You can browse the project resource model by going to the "Run" page.

diff --git a/rundeckapp/grails-app/controllers/FrameworkController.groovy b/rundeckapp/grails-app/controllers/FrameworkController.groovy
@@ -252,7 +252,7 @@ class FrameworkController  {
     def nodesFragment = {ExtNodeFilters query->
         def result = nodes(query)
         if(!result.nodesvalid){
-            request.error="Error parsing file \"${result.nodesfile}\": "+result.nodeserror.message
+            request.error="Error parsing file \"${result.nodesfile}\": "+result.nodeserror? result.nodeserror.message:'no message'
         }
         render(template:"allnodes",model: result)
     }

diff --git a/test/api/test-project-resources-refresh.sh b/test/api/test-project-resources-refresh.sh
@@ -31,7 +31,7 @@ TRES=$TETC/resources.xml
 if [ ! -f $TPROPS.testbackup ] ; then
     cp $TPROPS $TPROPS.testbackup
 fi
-if [ ! -f $TRES.testbackup ] ; then
+if [ ! -f $TRES.testbackup -a -f $TRES ] ; then
     cp $TRES $TRES.testbackup
 fi