Skip to content

Commit 16985e9

Browse files
committed
renamed stats.pipe to webstats.pipe
1 parent 652754e commit 16985e9

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

bin/v_add_web_domain_stats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ cat $WEBTPL/$type.tpl |\
7272

7373
# Schedule statistic processing
7474
echo "$BIN/v_update_web_domain_stat $user $domain" >> \
75-
$VESTA/data/queue/stats.pipe
75+
$VESTA/data/queue/webstats.pipe
7676

7777
# Update config
7878
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"

bin/v_delete_user

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ if [ "$rv" -ne '0' ]; then
8585
fi
8686

8787
# Deleteing user pipes
88-
sed -i "/v_update_db_bases_disk $user$/d" $VESTA/data/queue/disk.pipe
89-
sed -i "/v_update_web_domains_traff $user$/d" $VESTA/data/queue/traffic.pipe
90-
sed -i "/v_update_web_domain_stat $user /d" $VESTA/data/queue/stats.pipe
88+
sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe
89+
sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe
9190

9291
# Removing system user
9392
/usr/sbin/userdel -f $user

bin/v_delete_web_domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ fi
8383

8484
# Checking stats
8585
if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then
86-
sed -i "/ $domain$/d" $VESTA/data/queue/stats.pipe
86+
sed -i "/ $domain$/d" $VESTA/data/queue/webstats.pipe
8787
rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
8888
fi
8989

bin/v_delete_web_domain_stats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
5656
#----------------------------------------------------------#
5757

5858
# Deleting pipe command
59-
sed -i "/ $domain$/d" $VESTA/data/queue/stats.pipe
59+
sed -i "/ $domain$/d" $VESTA/data/queue/webstats.pipe
6060

6161
# Update config
6262
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' ''

bin/v_rebuild_web_domains

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ for domain in $(shell_list) ; do
136136
-e "s/%alias_idn%/${aliases_idn//,/ }/g" \
137137
> $HOMEDIR/$user/conf/web/$STATS.$domain.conf
138138

139-
stats_string="$BIN/v_update_web_domain_stat $user $domain"
140-
check_stats_pipe=$(grep "$stats_string" $VESTA/data/queue/stats.pipe)
141-
if [ -z "$check_stats_pipe" ]; then
142-
echo "$stats_string" >> $VESTA/data/queue/stats.pipe
139+
webstats="$BIN/v_update_web_domain_stat $user $domain"
140+
check_webstats=$(grep "$webstats" $VESTA/data/queue/webstats.pipe)
141+
if [ -z "$check_webstats" ]; then
142+
echo "$webstats" >> $VESTA/data/queue/webstats.pipe
143143
fi
144144

145145
if [ ! -z "$STATS_USER" ]; then

bin/v_update_sys_queue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ case $queue in
4343
restart) bash $VESTA/data/queue/restart.pipe;
4444
rm $VESTA/data/queue/restart.pipe;
4545
touch $VESTA/data/queue/restart.pipe;;
46-
stats) bash $VESTA/data/queue/stats.pipe;;
46+
webstats) bash $VESTA/data/queue/webstats.pipe;;
4747
backup) bash $VESTA/data/queue/backup.pipe;;
4848
disk) bash $VESTA/data/queue/disk.pipe;;
4949
traffic) bash $VESTA/data/queue/traffic.pipe;;

0 commit comments

Comments
 (0)