mirror of https://github.com/Aidaho12/haproxy-wi
				
				
				
			v3.9
							parent
							
								
									a7f43aefd6
								
							
						
					
					
						commit
						5c980cf114
					
				| 
						 | 
					@ -459,7 +459,7 @@ def update_db_v_3_8_1(**kwargs):
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
def update_ver(**kwargs):
 | 
					def update_ver(**kwargs):
 | 
				
			||||||
	con, cur = get_cur()
 | 
						con, cur = get_cur()
 | 
				
			||||||
	sql = """update version set version = '3.8.2'; """
 | 
						sql = """update version set version = '3.9'; """
 | 
				
			||||||
	try:    
 | 
						try:    
 | 
				
			||||||
		cur.execute(sql)
 | 
							cur.execute(sql)
 | 
				
			||||||
		con.commit()
 | 
							con.commit()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -592,6 +592,12 @@ def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', h
 | 
				
			||||||
		return ssh_command(syslog_server, commands, show_log='1')
 | 
							return ssh_command(syslog_server, commands, show_log='1')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
 | 
					def haproxy_wi_log():
 | 
				
			||||||
 | 
						log_path = get_config_var('main', 'log_path')
 | 
				
			||||||
 | 
						cmd = "find "+log_path+"/haproxy-wi-* -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | head -1 |awk '{print $4}' |xargs tail|sort -r"
 | 
				
			||||||
 | 
						output, stderr = subprocess_execute(cmd)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return output
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
def show_ip(stdout):
 | 
					def show_ip(stdout):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -53,5 +53,6 @@ template = template.render(h2 = 1,
 | 
				
			||||||
							date = funct.get_data('logs'),
 | 
												date = funct.get_data('logs'),
 | 
				
			||||||
							error = stderr,
 | 
												error = stderr,
 | 
				
			||||||
							versions = funct.versions(),
 | 
												versions = funct.versions(),
 | 
				
			||||||
 | 
												haproxy_wi_log = funct.haproxy_wi_log(),
 | 
				
			||||||
							token = token)
 | 
												token = token)
 | 
				
			||||||
print(template)											
 | 
					print(template)											
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -245,6 +245,39 @@
 | 
				
			||||||
			</tr>
 | 
								</tr>
 | 
				
			||||||
		{% endfor %}
 | 
							{% endfor %}
 | 
				
			||||||
	</table>
 | 
						</table>
 | 
				
			||||||
 | 
						
 | 
				
			||||||
 | 
						<table class="overview-wi">
 | 
				
			||||||
 | 
							<tr class="overviewHead">
 | 
				
			||||||
 | 
								<td class="padding10 first-collumn-wi">Recent HAProxy-WI`s log</td> 
 | 
				
			||||||
 | 
								<td>
 | 
				
			||||||
 | 
									<span class="add-button-wi">
 | 
				
			||||||
 | 
										<a title="Show more log" id="show-all-haproxy-wi-log" style="color: #fff">
 | 
				
			||||||
 | 
											Show more log
 | 
				
			||||||
 | 
										</a>
 | 
				
			||||||
 | 
									</span>
 | 
				
			||||||
 | 
								</td>
 | 
				
			||||||
 | 
							</tr>		
 | 
				
			||||||
 | 
							<tr>
 | 
				
			||||||
 | 
							{% set counter = 0 -%}	
 | 
				
			||||||
 | 
							{% for log in haproxy_wi_log %}
 | 
				
			||||||
 | 
								{% set counter = counter + loop.index0 %}
 | 
				
			||||||
 | 
								{% if counter <= 2 %}
 | 
				
			||||||
 | 
								<tr class="{{ loop.cycle('odd', 'even') }}">
 | 
				
			||||||
 | 
									<td class="padding10 first-collumn-wi" style="font-size: 12.5px;" colspan="2"> 
 | 
				
			||||||
 | 
										{{log }}				
 | 
				
			||||||
 | 
									</td>
 | 
				
			||||||
 | 
								</tr>
 | 
				
			||||||
 | 
								{% else %}
 | 
				
			||||||
 | 
								<tr style="display: none;" class="show-haproxy-wi-log" class="{{ loop.cycle('odd', 'even') }}">
 | 
				
			||||||
 | 
									<td class="padding10 first-collumn-wi" style="font-size: 12.5px" colspan="2"> 
 | 
				
			||||||
 | 
										{{log }}				
 | 
				
			||||||
 | 
									</td>
 | 
				
			||||||
 | 
								</tr>
 | 
				
			||||||
 | 
								{% endif %}
 | 
				
			||||||
 | 
							{% endfor %}
 | 
				
			||||||
 | 
							</tr>	
 | 
				
			||||||
 | 
						</table>
 | 
				
			||||||
 | 
						
 | 
				
			||||||
{% endif %}
 | 
					{% endif %}
 | 
				
			||||||
<div id="dialog-confirm" style="display: none;">
 | 
					<div id="dialog-confirm" style="display: none;">
 | 
				
			||||||
  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Are you sure?</p>
 | 
					  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Are you sure?</p>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue