From a6dc9e0696cb9fc733fa7d5eb3d34aa90b876340 Mon Sep 17 00:00:00 2001
From: Matthieu CERDA <matthieu.cerda@normation.com>
Date: Fri, 27 Sep 2013 15:47:53 +0200
Subject: [PATCH] Fixes #3969: (DEVELOPMENT) Move failing inventories to the
 right directory

---
 .../node-server/distributePolicy/1.0/propagatePromises.cf    | 5 ++---
 .../cfengine-nova/distributePolicy/propagatePromises.cf      | 3 +--
 techniques/system/distributePolicy/1.0/propagatePromises.st  | 2 +-
 tools/send-clean.sh                                          | 3 +++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/initial-promises/node-server/distributePolicy/1.0/propagatePromises.cf b/initial-promises/node-server/distributePolicy/1.0/propagatePromises.cf
index a2c247ac8..d53e23c31 100644
--- 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/initial-promises/rootServerInitialPromises/cfengine-nova/distributePolicy/propagatePromises.cf b/initial-promises/rootServerInitialPromises/cfengine-nova/distributePolicy/propagatePromises.cf
index 95f4741a9..dfc215110 100644
--- a/initial-promises/rootServerInitialPromises/cfengine-nova/distributePolicy/propagatePromises.cf
+++ b/initial-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
index 3e9597637..66c6d0cf8 100644
--- 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
index 3ddc38c37..e90d546b2 100755
--- 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