frodovdr/raspberrymatic-addon-rmupdate
1
0
Fork 0
mirror of https://github.com/j-a-n/raspberrymatic-addon-rmupdate.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Improve error logging and message

Browse Source
This commit is contained in:
Jan Schneider 2020-01-11 09:35:19 +01:00
parent 1c94fb0fdf
commit 1a1a8d422d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addon/www/index.html
View File

@ -59,7 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
function display_message(type, text, millis) { function display_message(type, text, millis) {
clear_message(); clear_message();
$('#message').contents().last()[0].textContent = text; $('#message-text').html(text);
$('#message').attr('class', 'ui ' + type + ' message visible'); $('#message').attr('class', 'ui ' + type + ' message visible');
message_timer_id = setTimeout(clear_message, millis); message_timer_id = setTimeout(clear_message, millis);
} }
@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
clearTimeout(message_timer_id); clearTimeout(message_timer_id);
} }
message_timer_id = null; message_timer_id = null;
$('#message').contents().last()[0].textContent = ''; $('#message-text').html('');
$('#message').attr('class', 'ui message hidden'); $('#message').attr('class', 'ui message hidden');
} }
@ -256,9 +256,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// We are not expecting a response // We are not expecting a response
}, },
function(xhr, ajaxOptions, thrownError) { function(xhr, ajaxOptions, thrownError) {
err = thrownError;
try {
obj = JSON.parse(xhr.responseText);
if (obj.error != null) {
err = obj.error;
}
}
catch(e) {
}
console.error("Firmware installation error: " + thrownError + ": " + xhr.responseText); console.error("Firmware installation error: " + thrownError + ": " + xhr.responseText);
//$('#modal-log').modal('hide'); //$('#modal-log').modal('hide');
set_running_installation("", thrownError + ": " + xhr.responseText); set_running_installation("", err);
} }
); );
} }
@ -980,6 +989,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<div class="ui container"> <div class="ui container">
<div id="message" class="ui message hidden" style="margin-left: 100px; margin-right: 100px; min-height: 50px; min-width: 340px"> <div id="message" class="ui message hidden" style="margin-left: 100px; margin-right: 100px; min-height: 50px; min-width: 340px">
<i class="close icon" onclick="clear_message();"></i> <i class="close icon" onclick="clear_message();"></i>
<pre id="message-text" style='font-family: Lato,"Helvetica Neue",Arial,Helvetica,sans-serif; white-space: pre-wrap;' />
</div> </div>
</div> </div>
</div> </div>

2
addon/www/rest.cgi
View File

@ -240,7 +240,7 @@ if [catch {process} result] {
puts "Content-Type: ${content_type}" puts "Content-Type: ${content_type}"
puts "Status: $status"; puts "Status: $status";
puts "" puts ""
set result [json_string $result] set result [json_string "${result} - ${::errorCode} - ${::errorInfo}"]
puts -nonewline "\{\"error\":\"${result}\"\}" puts -nonewline "\{\"error\":\"${result}\"\}"
} else { } else {
puts "Content-Type: ${content_type}" puts "Content-Type: ${content_type}"