diff options
author | Aleksey Lim <alsroot@sugarlabs.org> | 2012-07-30 18:04:52 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@sugarlabs.org> | 2012-07-30 18:04:52 (GMT) |
commit | 6fad82b1eee71687604a465584e862b9c840d019 (patch) | |
tree | 79eac8a684b5aa5b1118c23784796d62bd06fd51 /sugar-network-sync | |
parent | e23804ade0413706d125bb5be57093e56ed91692 (diff) |
Process files_pull requestes on master side
Diffstat (limited to 'sugar-network-sync')
-rwxr-xr-x | sugar-network-sync | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sugar-network-sync b/sugar-network-sync index 1b28c3a..2a2f162 100755 --- a/sugar-network-sync +++ b/sugar-network-sync @@ -106,9 +106,9 @@ upload() { fi if [ -e "${cookie}" ]; then - if grep SN_BREAK "${cookie}" >/dev/null; then + if grep unset_sugar_network_sync "${cookie}" >/dev/null; then rm "${cookie}" - elif grep SN_CONTINUE "${cookie}" >/dev/null; then + elif grep sugar_network_sync "${cookie}" >/dev/null; then phase "Postpone pull with ${cookie}" else rm "${cookie}" @@ -134,7 +134,7 @@ pull() { upload "${api_url}&accept_length=${disk_free}" "${cookie}" [ -e "${cookie}" ] || break - delay=$(grep -o 'sn_delay:[0-9]\+' "${cookie}" 2>/dev/null | awk -F: '{print $2}') + delay=$(grep -o 'sugar_network_delay[[:space:]]*[0-9]\+' "${cookie}" 2>/dev/null | awk '{print $2}') if [ "${delay}" ]; then phase "Server started processing pull, check for results in ${delay} seconds" sleep ${delay} |