From 09361dcd6ed9c2f48b9b623f9aca8e1618373470 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 2 Aug 2016 13:56:05 -0300
Subject: Do not scp log files

---
 build.conf.sample         |  1 -
 build.sh                  |  1 -
 tools/builder_common.sh   | 14 --------------
 tools/builder_defaults.sh |  3 ---
 4 files changed, 19 deletions(-)

diff --git a/build.conf.sample b/build.conf.sample
index 6f1d627..f37484c 100644
--- a/build.conf.sample
+++ b/build.conf.sample
@@ -69,7 +69,6 @@ export PRODUCT_URL="https://PRODUCT_URL/"
 #export RSYNCIP="your.snapshot.server"
 #export RSYNCUSER="username"
 #export RSYNCPATH="/usr/local/www/snapshots"
-#export RSYNCLOGS="/usr/local/www/snapshots/logs"
 
 # rsync data to upload pkg repo
 #export PKG_RSYNC_HOSTNAME="pkg_repo_hostname"
diff --git a/build.sh b/build.sh
index 2cada48..dcfe22a 100755
--- a/build.sh
+++ b/build.sh
@@ -315,7 +315,6 @@ if [ -n "${SNAPSHOTS}" -a -z "${DO_NOT_UPLOAD}" ]; then
 		RSYNCIP \
 		RSYNCUSER \
 		RSYNCPATH \
-		RSYNCLOGS \
 		PKG_RSYNC_HOSTNAME \
 		PKG_RSYNC_USERNAME \
 		PKG_RSYNC_SSH_PORT \
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 2b8ec20..ba29edc 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -2448,8 +2448,6 @@ poudriere_bulk() {
 
 # This routine is called to write out to stdout
 # a string. The string is appended to $SNAPSHOTSLOGFILE
-# and we scp the log file to the builder host if
-# needed for the real time logging functions.
 snapshots_update_status() {
 	if [ -z "$1" ]; then
 		return
@@ -2459,18 +2457,6 @@ snapshots_update_status() {
 	fi
 	echo "$*"
 	echo "`date` -|- $*" >> $SNAPSHOTSLOGFILE
-	if [ -z "${DO_NOT_UPLOAD}" -a -n "${SNAPSHOTS_RSYNCIP}" ]; then
-		LU=$(cat $SNAPSHOTSLASTUPDATE 2>/dev/null)
-		CT=$(date "+%H%M%S")
-		# Only update every minute
-		if [ "$LU" != "$CT" ]; then
-			ssh ${SNAPSHOTS_RSYNCUSER}@${SNAPSHOTS_RSYNCIP} \
-				"mkdir -p ${SNAPSHOTS_RSYNCLOGS}"
-			scp -q $SNAPSHOTSLOGFILE \
-				${SNAPSHOTS_RSYNCUSER}@${SNAPSHOTS_RSYNCIP}:${SNAPSHOTS_RSYNCLOGS}/build.log
-			date "+%H%M%S" > $SNAPSHOTSLASTUPDATE
-		fi
-	fi
 }
 
 create_sha256() {
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index bdf3c03..4646f80 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -386,7 +386,6 @@ export NANOBSD_UPGRADE_TEMPLATE=${NANOBSD_UPGRADE_TEMPLATE:-"${PRODUCT_NAME}${PR
 # Rsync data to send snapshots
 export RSYNCUSER=${RSYNCUSER:-"snapshots"}
 export RSYNCPATH=${RSYNCPATH:-"/usr/local/www/snapshots/${TARGET}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"}
-export RSYNCLOGS=${RSYNCLOGS:-"/usr/local/www/snapshots/logs/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}/${TARGET}"}
 export RSYNCKBYTELIMIT=${RSYNCKBYTELIMIT:-"248000"}
 
 # staging area used on snapshots build
@@ -399,11 +398,9 @@ export SNAPSHOTSLASTUPDATE=${SNAPSHOTSLASTUPDATE:-"${SCRATCHDIR}/snapshots-lastu
 if [ -n "${POUDRIERE_SNAPSHOTS}" ]; then
 	export SNAPSHOTS_RSYNCIP=${PKG_RSYNC_HOSTNAME}
 	export SNAPSHOTS_RSYNCUSER=${PKG_RSYNC_USERNAME}
-	export SNAPSHOTS_RSYNCLOGS=${PKG_RSYNC_LOGS}
 else
 	export SNAPSHOTS_RSYNCIP=${RSYNCIP}
 	export SNAPSHOTS_RSYNCUSER=${RSYNCUSER}
-	export SNAPSHOTS_RSYNCLOGS=${RSYNCLOGS}
 fi
 
 if [ "${PRODUCT_NAME}" = "pfSense" ]; then
-- 
cgit v1.1