Download webui logs functionality added!

ArduPilot · Jun 14, 2018 · f169f9c · f169f9c
1 parent c6d0324
commit f169f9c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 37 deletions.
diff --git a/br-webui/_includes/header.liquid b/br-webui/_includes/header.liquid
@@ -14,19 +14,6 @@
 		function shutdown() {
 			socket.emit('shutdown');
 		}
-		
-		function send() {
-			console.log('got into the function send');
-			socket.emit('sendlog');
-
-		}
-			
-		socket.on('getlogs', function(data) {
-			console.log("In get logs <header>");
-		 	console.log(data);
-		});
-		
-			
 	</script>
 	<link rel="stylesheet" href="/css/bootstrap.min.css">
 	<link rel="stylesheet" href="/font-awesome/css/font-awesome.min.css">
@@ -55,10 +42,11 @@
 				<form class="navbar-form navbar-right">
 					<button onclick="reboot()" class="btn btn-primary btn-sm navbar-btn">Reboot</button>
 					<button onclick="shutdown()" class="btn btn-error btn-sm navbar-btn">Shutdown</button>
-					<button type="button" onclick="send()" class="btn btn-primary btn-sm navbar-btn">
-						Send Error Log
-
-					</button>
+					<a href="/webui.log" download>
+						<button type="button" class="btn btn-primary btn-sm navbar-btn">
+							Send Error Log
+						</button>
+					</a>
 				</form>
 			</div><!--/.nav-collapse -->
 		</div>

diff --git a/br-webui/index.js b/br-webui/index.js
@@ -9,6 +9,7 @@ var env = process.env
 logger.log('ENVIRONMENT', process.env)
 logger.log('COMPANION_DIR', process.env.COMPANION_DIR)
 app.use(express.static('public'));
+app.use('/webui.log', express.static('/home/pi/.webui.log'));
 app.use('/js', express.static(__dirname + '/node_modules/bootstrap/dist/js')); // redirect bootstrap JS
 app.use('/js', express.static(__dirname + '/node_modules/jquery/dist')); // redirect JS jQuery
 app.use('/font-awesome', express.static(__dirname + '/node_modules/font-awesome')); // redirect JS jQuery
@@ -1593,13 +1594,6 @@ io.on('connection', function(socket) {
 		});
 	});
 
-	socket.on('sendlog', function(data) {
-		logger.log('sendlog');
-		var cmd = child_process.exec('ls', function (error, stdout, stderr) {
-			socket.emit('getlogs',"hi");
-			logger.log('entered function sendlog');
-		});
-	});
 	var uploader = new SocketIOFile(socket, {
 		// uploadDir: {			// multiple directories 
 		// 	music: 'data/music', 

diff --git a/br-webui/views/camera.liquid b/br-webui/views/camera.liquid
@@ -7,7 +7,6 @@
 <script src="js/bootstrap-slider.js"></script>
 
 <script>
-	//var socket = io();
 
 	var _cameras = [];
 	var _activeFormat = {};

diff --git a/br-webui/views/network.liquid b/br-webui/views/network.liquid
@@ -6,10 +6,6 @@
 // WiFi Setup
 var networking = io('/networking');
 
-socket.on('getlogs', function(data) {
-	console.log("In get logs <network>");
- 	console.log(data);
-});
 networking.on('wifi aps', function(data) {
 
 	console.log('got wifi aps')

diff --git a/br-webui/views/routing.liquid b/br-webui/views/routing.liquid
@@ -1,7 +1,6 @@
 {% include ../_includes/header.liquid %}
 
 <script>
-	var socket = io();
 	var config;
 
 	socket.on('serial ids', function (data) {
@@ -312,4 +311,4 @@
 </div>
 
 
-{% include ../_includes/footer.liquid %}
+{% include ../_includes/footer.liquid %}
diff --git a/br-webui/views/system.liquid b/br-webui/views/system.liquid
@@ -3,7 +3,6 @@
 <script src="socket.io-file-client.js"></script> 
 <script>
 var _updating = false;
-//var socket = io();
 
 // Listen to internet connectivity status updates from the backend
 // Disable features that require backend internet connectivity when
@@ -21,11 +20,6 @@ socket.on('cpu stats', function(data) {
 	console.log('got cpu status', data);
 });
 
-socket.on('getlogs', function(data) {
-	console.log("In get logs <system>");
- 	console.log(data);
-});
-
 socket.on('terminal output', function(data) {
 	var terminalEl = document.getElementById("terminal-output");
 	var html = terminalEl.innerHTML + data;