From 76e8a7e890327a4473b44bad7674817bc8c12c25 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 12 Sep 2013 11:00:30 +0300 Subject: [PATCH] improved dns-sync algorytm --- bin/v-add-dns-record | 8 ++++++-- bin/v-change-dns-domain-exp | 8 ++++++-- bin/v-change-dns-domain-ip | 8 ++++++-- bin/v-change-dns-domain-soa | 8 ++++++-- bin/v-change-dns-domain-tpl | 8 ++++++-- bin/v-change-dns-domain-ttl | 8 ++++++-- bin/v-change-dns-record | 8 ++++++-- bin/v-change-dns-record-id | 8 ++++++-- bin/v-delete-dns-record | 8 ++++++-- 9 files changed, 54 insertions(+), 18 deletions(-) diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index d03b90100..bc5b99865 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -75,8 +75,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-add-remote-dns-record $user $domain $id" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-add-remote-dns-record $user $domain $id" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp index 88dedaaaa..08623135b 100755 --- a/bin/v-change-dns-domain-exp +++ b/bin/v-change-dns-domain-exp @@ -43,8 +43,12 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$EXP' "$exp" # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-change-remote-dns-domain-exp $user $domain" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-change-remote-dns-domain-exp $user $domain $exp" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index a7f50cd6e..6488bb826 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -54,8 +54,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-add-remote-dns-domain $user $domain" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-add-remote-dns-domain $user $domain" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index 5daf53010..875bc7275 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -48,8 +48,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-change-remote-dns-domain-soa $user $domain" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-change-remote-dns-domain-soa $user $domain $soa" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index c18f76751..22222165e 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -72,8 +72,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-add-remote-dns-domain $user $domain" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-add-remote-dns-domain $user $domain" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index f812ac35d..88c50813e 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -47,8 +47,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-change-remote-dns-domain-ttl $user $domain" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-change-remote-dns-domain-ttl $user $domain $ttl" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 9f08af68b..c46727f59 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -65,8 +65,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-add-remote-dns-domain $user $domain" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-add-remote-dns-domain $user $domain" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index f492b4ebc..0f76290a6 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -54,8 +54,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-add-remote-dns-domain $user $domain" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-add-remote-dns-domain $user $domain" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index 43b10344b..6b23a1c0a 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -47,8 +47,12 @@ update_domain_zone # dns-cluster if [ ! -z "$DNS_CLUSTER" ]; then - cmd="$BIN/v-delete-remote-dns-record $user $domain $id" - echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + # Check for first sync + dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe) + if [ -z "$dlock" ]; then + cmd="$BIN/v-delete-remote-dns-record $user $domain $id" + echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe + fi fi