Project

General

Profile

« Previous | Next » 

Revision c1070fdf

Added by NOYB NOYB over 9 years ago

Status / System Logs / Firewall / Dynamic View - Efficiency Tweaks

Not very efficient to go through the entire table setting the class on existing entries that already have their class set. Just set the class on new entries when they are added to the table.

Just get the rowCount instead of the array.

View differences:

src/usr/local/www/status_logs_filter_dynamic.php
165 165
	$specific_log = basename($logfile, '.log') . '_settings';
166 166
	if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $reverse = false;
167 167
	if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $reverse = true;
168

  
169
	if ($reverse) {
170
		echo "var isReverse = true;\n";
171
	} else {
172
		echo "var isReverse = false;\n";
173
	}
174 168
?>
175 169
	var filter_query_string = "<?=$filter_query_string . '&logfile=' . $logfile_path . '&nentries=' . $nentries?>";
176 170

  
171
	var isReverse = "<?=$reverse?>";
172

  
177 173
	/* Called by the AJAX updater */
178 174
	function format_log_line(row) {
179 175
		if (row[8] == '6') {
......
332 328
		move += rows.length;
333 329
	}
334 330

  
331
	var tr_classes = 'text-nowrap';
332

  
335 333
	if (isReverse == false) {
336 334
		for (var i = move; i < rows.length; i++) {
337 335
			$(rows[i - move]).html($(rows[i]).html());
......
343 341
			var rowIndex = rows.length - move + i;
344 342
			if (rowIndex < rows.length) {
345 343
				$(rows[rowIndex]).html(data[i]);
344
				$(rows[rowIndex]).className = tr_classes;
346 345
			} else {
347
				$(tbody).append('<tr>' + data[i] + '</tr>');
346
				$(tbody).append('<tr class="' + tr_classes + '">' + data[i] + '</tr>');
348 347
			}
349 348
		}
350 349
	} else {
......
358 357
			var rowIndex = move - 1 - i;
359 358
			if (rowIndex >= 0) {
360 359
				$(rows[rowIndex]).html(data[i]);
360
				$(rows[rowIndex]).className = tr_classes;
361 361
			} else {
362
				$(tbody).prepend('<tr>' + data[i] + '</tr>');
362
				$(tbody).prepend('<tr class="' + tr_classes + '">' + data[i] + '</tr>');
363 363
			}
364 364
		}
365 365
	}
366 366

  
367
	// Much easier to go through each of the rows once they've all be added.
368
	rows = $('#filter-log-entries>tr');
369
	for (var i = 0; i < rows.length; i++) {
370
		rows[i].className = 'text-nowrap';
371
	}
372

  
373
	$("#count").html(rows.length);
367
	var rowCount = $('#filter-log-entries>tr').length;
368
	$("#count").html(rowCount);
374 369

  
375 370
	$('.fa').tooltip();
376 371
}

Also available in: Unified diff