Merge pull request #230 from Kegeruneku/ust_3139/dev/3969_move_broken…

…_inventories_to_graveyard Fixes #3969: (DEVELOPMENT) Move failing inventories to the right directo...
Normation · Oct 21, 2013 · 803ad72 · 803ad72
2 parents 71e04a6 + a6dc9e0
commit 803ad72
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/initial-promises/node-server/distributePolicy/1.0/propagatePromises.cf b/initial-promises/node-server/distributePolicy/1.0/propagatePromises.cf
@@ -85,20 +85,19 @@ bundle agent sendInventoryToCmdb
     root_server::
 
       "${g.rudder_inventories}/incoming"
-        transformer => "${g.rudder_dependencies}/send-clean.sh http://localhost:8080/endpoint/upload/ ${this.promiser} ${g.rudder_inventories}/received/",
+        transformer => "${g.rudder_dependencies}/send-clean.sh http://localhost:8080/endpoint/upload/ ${this.promiser} ${g.rudder_inventories}/received/ ${g.rudder_inventories}/failed/",
         depth_search => recurse_visible(1),
         file_select => all_files,
         classes => if_else("inventory_sent", "rudder_send_inventory_to_cmdb_cant_send_inventory"),
         comment => "Sending the inventory to the cmdb";
 
       "${g.rudder_inventories}/accepted-nodes-updates"
-        transformer => "${g.rudder_dependencies}/send-clean.sh http://localhost:8080/endpoint/upload/ ${this.promiser} ${g.rudder_inventories}/received/",
+        transformer => "${g.rudder_dependencies}/send-clean.sh http://localhost:8080/endpoint/upload/ ${this.promiser} ${g.rudder_inventories}/received/ ${g.rudder_inventories}/failed/",
         depth_search => recurse_visible(1),
         file_select => all_files,
         classes => if_else("inventory_sent", "rudder_send_inventory_to_cmdb_cant_send_inventory"),
         comment => "Sending the inventory to the cmdb";
 
-
 # NEED TO DO THE RSYNC PART
 
   reports:

diff --git a/...al-promises/rootServerInitialPromises/cfengine-nova/distributePolicy/propagatePromises.cf b/...al-promises/rootServerInitialPromises/cfengine-nova/distributePolicy/propagatePromises.cf
@@ -83,13 +83,12 @@ bundle agent sendInventoryToCmdb
   files:
     root_server::
       "${g.rudder_inventories}/incoming"
-        transformer => "${g.rudder_dependencies}/send-clean.sh http://localhost:8080/endpoint/upload/ ${this.promiser} ${g.rudder_inventories}/received/",
+        transformer => "${g.rudder_dependencies}/send-clean.sh http://localhost:8080/endpoint/upload/ ${this.promiser} ${g.rudder_inventories}/received/ ${g.rudder_inventories}/failed/",
         depth_search => recurse_visible(1),
         file_select => all_files,
         classes => if_else("inventory_sent", "cant_send_inventory"),
         comment => "Sending the inventory to the cmdb";
 
-
 # NEED TO DO THE RSYNC PART
 
   reports:

diff --git a/techniques/system/distributePolicy/1.0/propagatePromises.st b/techniques/system/distributePolicy/1.0/propagatePromises.st
@@ -108,7 +108,7 @@ bundle agent sendInventoryToCmdb
     root_server::
 
       "${g.rudder_inventories}/${inventory_folders}"
-        transformer => "${g.rudder_dependencies}/send-clean.sh &CMDBENDPOINT& ${this.promiser} ${g.rudder_inventories}/received/",
+        transformer => "${g.rudder_dependencies}/send-clean.sh &CMDBENDPOINT& ${this.promiser} ${g.rudder_inventories}/received/ ${g.rudder_inventories}/failed/",
         depth_search => recurse_visible(1),
         file_select => all_files,
         classes => rudder_common_classes("rudder_inventory_processing"),

diff --git a/tools/send-clean.sh b/tools/send-clean.sh
@@ -26,6 +26,8 @@ fi
 SERVER=$1
 FILENAME=$2
 ARCHIVEDIR=$3
+FAILEDDIR=$4
+BASENAME=$(basename ${2})
 CURL_BINARY="/usr/bin/curl"
 
 # Attempt to send the file
@@ -34,6 +36,7 @@ SEND_COMMAND_RET=$?
 
 # Abort if sending failed
 if [ ${SEND_COMMAND_RET} -ne 0 ]; then
+	mv "${FILENAME}" "${FAILEDDIR}/${BASENAME}-$(date --rfc-3339=date)"
 	exit ${SEND_COMMAND_RET}
 fi