Monito/monito
Monito/monito
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better multi-server implementation

Browse Source
This commit is contained in:
Benjamin Drieu 2021-12-01 16:18:38 +01:00 committed by Benjamin Drieu
parent 42d4537b23
commit c4245fe199
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extension.js
View File

@ -257,7 +257,7 @@ class Indicator extends PanelMenu.Button {
if ( ! col [ 'special' ] )
_child = new St.Label({ style_class: 'monito-label', text: text.toString(), });
else if ( col.special == 'actions' )
else if ( col.special == 'actions' && this.serverLogic.canRecheck )
{
_child = new St.BoxLayout ( { x_expand: true,
x_align: Clutter.ActorAlign.FILL,
@ -389,7 +389,8 @@ class Indicator extends PanelMenu.Button {
infoBox.add_child ( this.createBin ( entry.status, entry [ _col ], column_definitions [ _col ] ) );
}
infoBox.add_child ( this.createBin ( entry.status, entry, column_definitions [ 'actions' ] ) );
if ( this.serverLogic.canRecheck )
infoBox.add_child ( this.createBin ( entry.status, entry, column_definitions [ 'actions' ] ) );
_row ++;
}

26
servers/genericserver.js
View File

@ -29,7 +29,8 @@ const Me = ExtensionUtils.getCurrentExtension();
const Preferences = Me.imports.prefs;
class GenericServer {
class GenericServer {
constructor ( _server, _serverType = 'Generic' )
{
log ( '>>> New %s server #%s'.format ( _serverType, _server ) );
@ -38,6 +39,8 @@ class GenericServer {
this._settings = Preferences.getAccountSettings ( this._server );
this._httpSession = null;
this._url = null;
this.canRecheck = true;
}
getServer ( )
@ -105,6 +108,27 @@ class GenericServer {
}
}
handleCMDMessage ( _httpSession, message )
{
let _data;
try {
_data = this.handleMessage ( _httpSession, message );
if ( this.error )
log ( 'Parent error ' + this.error );
else
{
// if error, grep for class='errorMessage'
// else grep for class='successBox'
log ( 'Cmd output ' + _data );
}
}
catch ( e )
{
log ( e );
log ( _data );
}
}
getProcessedStatus ( )
{

21
servers/icinga.js
View File

@ -104,26 +104,5 @@ class Icinga extends GenericServer {
log ( _data );
}
}
handleCMDMessage ( _httpSession, message )
{
let _data;
try {
_data = super.handleMessage ( _httpSession, message );
if ( this.error )
log ( 'Parent error ' + this.error );
else
{
// if error, grep for class='errorMessage'
// else grep for class='successBox'
log ( 'Cmd output ' + _data );
}
}
catch ( e )
{
log ( e );
log ( _data );
}
}
}

2
servers/icinga2.js
View File

@ -33,6 +33,8 @@ const GenericServer = Me.imports.servers.genericserver.GenericServer;
class Icinga2 extends GenericServer {
constructor ( _server ) {
super(_server, 'Icinga2');
this.canRecheck = false;
}
refresh ( extension ) {