Delete command for uploading data twice (osm-fr#3)

* Delete command for uploading data twice * Retry 3 times * Sleep between tries * Fix method * Fix logical error
alkino · Apr 30, 2021 · afac8af · afac8af
1 parent 31aa92c
commit afac8af
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 39 deletions.
diff --git a/analyse-bano.sh b/analyse-bano.sh
@@ -127,7 +127,7 @@ echo "  </analyser>
 echo ""
 
 echo "sending to osmose frontend"
-curl -v --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}" && echo -e "\n\rcurl ok" || echo -e "\n\rcurl ko"
+send_frontend $OUT
 
 done
 
@@ -213,4 +213,4 @@ done
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyse-sirene.sh b/analyse-sirene.sh
@@ -24,5 +24,5 @@ select format('<error class=\"99\" subclass=\"1\"><location lat=\"%s\" lon=\"%s\
 echo "  </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
 
diff --git a/analyse_volta_lignes_RTE.sh b/analyse_volta_lignes_RTE.sh
@@ -46,7 +46,5 @@ from (
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-sleep 30
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
 
diff --git a/analyse_volta_postes.sh b/analyse_volta_postes.sh
@@ -81,7 +81,4 @@ done
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-sleep 30
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-
+send_frontend $OUT
diff --git a/analyzer-admin-express.sh b/analyzer-admin-express.sh
@@ -30,4 +30,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --compressed --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-cadastre.sh b/analyzer-cadastre.sh
@@ -51,4 +51,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --compressed --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-missing-road.sh b/analyzer-missing-road.sh
@@ -33,4 +33,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --compressed --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-no-road-near-address.sh b/analyzer-no-road-near-address.sh
@@ -38,4 +38,4 @@ echo "
 </analysers>" >> $OUT
 
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-no-road-near-building.sh b/analyzer-no-road-near-building.sh
@@ -39,4 +39,4 @@ echo "
 </analysers>" >> $OUT
 
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-no-road-near-voirie.sh b/analyzer-no-road-near-voirie.sh
@@ -40,4 +40,4 @@ echo "
 </analysers>" >> $OUT
 
 echo "Envoi"
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-qa-missing-buildings.sh b/analyzer-qa-missing-buildings.sh
@@ -46,4 +46,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-qa-missing-highways.sh b/analyzer-qa-missing-highways.sh
@@ -28,7 +28,7 @@ echo "
 </analysers>" >> $OUT
 
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
 
 
 echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -54,4 +54,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-qa-missing-route500.sh b/analyzer-qa-missing-route500.sh
@@ -35,4 +35,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-qa-route500-lanes.sh b/analyzer-qa-route500-lanes.sh
@@ -30,4 +30,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/analyzer-road-name-ref.sh b/analyzer-road-name-ref.sh
@@ -31,4 +31,4 @@ echo "
   </analyser>
 </analysers>" >> $OUT
 
-curl -s --request POST --compressed --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/bdtopo/analyse_highway_bdtopo.sh b/bdtopo/analyse_highway_bdtopo.sh
@@ -56,7 +56,4 @@ done
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl --form source="opendata_xref-france" --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-sleep 30
-curl --form source="opendata_xref-france" --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-
+send_frontend $OUT
diff --git a/bdtopo/analyse_highway_decale.sh b/bdtopo/analyse_highway_decale.sh
@@ -66,7 +66,5 @@ done
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-sleep 30
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
 
diff --git a/bdtopo/analyse_highway_lanes_bdtopo.sh b/bdtopo/analyse_highway_lanes_bdtopo.sh
@@ -49,7 +49,4 @@ from (
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-sleep 30
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-
+send_frontend $OUT
diff --git a/bdtopo/analyse_waterway_bdtopo.sh b/bdtopo/analyse_waterway_bdtopo.sh
@@ -46,8 +46,4 @@ from (
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-sleep 300
-curl --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
-
-
+send_frontend $OUT
diff --git a/cadastre/analyse_voies_cadastre.sh b/cadastre/analyse_voies_cadastre.sh
@@ -54,4 +54,4 @@ done
 echo "  </analyser>
 </analysers>" | gzip -9 >> $OUT
 
-curl -v --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}"
+send_frontend $OUT
diff --git a/config.sh b/config.sh
@@ -11,3 +11,24 @@ else
 fi
 
 export URL_FRONTEND_UPDATE="http://osmose.openstreetmap.fr/control/send-update"
+
+send_frontend() {
+    $OUT = $1
+    tries = 0
+
+    echo "Sending result"
+
+    until [ "$tries" -ge 3 ]; do
+        tries=$(( $tries + 1 ))
+        echo "Try: '$tries'"
+        curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT -H 'Host: osmose.openstreetmap.fr' "${URL_FRONTEND_UPDATE}" && break
+        sleep 300
+    done
+
+    if [ "$tries" -eq 4 ]; do
+        echo "Impossible to send results"
+        exit 1
+    done
+
+    return
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,4 +38,4 @@ echo "
		</analysers>" >> $OUT


		curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
		send_frontend $OUT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,4 +39,4 @@ echo "
		</analysers>" >> $OUT


		curl -s --request POST --form source='opendata_xref-france' --form code="$OSMOSEPASS" --form content=@$OUT "${URL_FRONTEND_UPDATE}"
		send_frontend $OUT