v2.8

app/funct.py

@@ -301,7 +301,7 @@ def install_haproxy(serv, **kwargs):
 		proxy_serv = proxy
 	else:
 		proxy_serv = ""
-	commands = [ "chmod +x "+tmp_config_path+script, tmp_config_path+script +" " + proxy_serv]
+	commands = [ "chmod +x "+tmp_config_path+script+" && " +tmp_config_path+"/"+script +" " + proxy_serv]
 	
 	upload(serv, tmp_config_path, script)	
 	ssh_command(serv, commands)

app/sql.py

@@ -679,6 +679,18 @@ def select_metrics(serv, **kwargs):
 	cur.close()    
 	con.close()
 	
+def select_servers_metrics_for_master():
+	con, cur = create_db.get_cur()
+	sql = """select ip from servers where enable = 1 """
+	try:    
+		cur.execute(sql)
+	except sqltool.Error as e:
+		print("An error occurred:", e.args[0])
+	else:
+		return cur.fetchall()
+	cur.close()    
+	con.close() 
+	
 def select_servers_metrics(uuid, **kwargs):
 	con, cur = create_db.get_cur()
 	sql = """ select * from user where username = '%s' """ % get_user_name_by_uuid(uuid)

install.sh

@@ -158,8 +158,8 @@ After=syslog.target network.target
 
 [Service]
 Type=simple
-WorkingDirectory=/var/www/$HOME_HAPROXY_WI
+WorkingDirectory=/var/www/$HOME_HAPROXY_WI/app/
-ExecStart=/var/www/$HOME_HAPROXY_WI/tools/checker_master.py
+ExecStart=/var/www/$HOME_HAPROXY_WI/app/tools/checker_master.py
 
 StandardOutput=syslog
 StandardError=syslog
@@ -197,8 +197,8 @@ After=syslog.target network.target
 
 [Service]
 Type=simple
-WorkingDirectory=/var/www/haproxy-wi/app/
+WorkingDirectory=/var/www/$HOME_HAPROXY_WI/app/
-ExecStart=/var/www/haproxy-wi/app/tools/metrics_master.py
+ExecStart=/var/www/$HOME_HAPROXY_WI/app/tools/metrics_master.py
 
 StandardOutput=syslog
 StandardError=syslog

update.sh

@@ -23,7 +23,7 @@ After=syslog.target network.target
 
 [Service]
 Type=simple
-WorkingDirectory=$(pwd)/app
+WorkingDirectory=$(pwd)/app/
 ExecStart=$(pwd)/app/tools/checker_master.py
 
 StandardOutput=syslog
@@ -62,8 +62,8 @@ After=syslog.target network.target
 
 [Service]
 Type=simple
-WorkingDirectory=/var/www/haproxy-wi/app/
+WorkingDirectory=$(pwd)/app/
-ExecStart=/var/www/haproxy-wi/app/tools/metrics_master.py
+ExecStart=$(pwd)/app/tools/metrics_master.py
 
 StandardOutput=syslog
 StandardError=syslog
@@ -78,12 +78,12 @@ WantedBy=multi-user.target
 EOF
 
 cat << EOF > /etc/rsyslog.d/metrics.conf 
-if $programname startswith 'metrics' then /var/www/$HOME_HAPROXY_WI/log/metrics-error.log
+if $programname startswith 'metrics' then $(pwd)/log/metrics-error.log
 & stop
 EOF
 
 cat << EOF > /etc/logrotate.d/metrics
-/var/www/$HOME_HAPROXY_WI/log/metrics-error.log {
+$(pwd)/log/metrics-error.log {
     daily
     rotate 10
     missingok