shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #3951: rename FireEdge (#926)

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.io>
This commit is contained in:
Jorge Miguel Lobo Escalona 2021-03-08 14:14:37 +01:00 committed by GitHub
parent 4133d04314
commit 4ea0628a3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fireedge/fireedge-server.conf
View File

@ -8,7 +8,7 @@ log: prod
# Enable cors (cross-origin resource sharing)
cors: true
# Fireedge server host
# FireEdge server host
host: '0.0.0.0'
# FireEdge server port

2
src/sunstone/etc/sunstone-server.conf
View File

@ -260,7 +260,7 @@
:threshold_high: 66
################################################################################
# Fireedge
# FireEdge
################################################################################
:private_fireedge_endpoint: http://localhost:2616

32
src/sunstone/public/app/utils/fireedge-validator.js
View File

@ -17,7 +17,7 @@
define(function (require) {
var Config = require("sunstone-config");
var Notifier = require('utils/notifier');
var Notifier = require("utils/notifier");
// user config
const fireedge_endpoint = Config.publicFireedgeEndpoint;
@ -32,15 +32,15 @@ define(function (require) {
var _connected = function(){
return connection == STATUS.CONNECTED;
}
};
var _disconnected = function(){
return connection == STATUS.DISCONNECTED;
}
};
var _processing = function(){
return connection == STATUS.PROCESSING;
}
};
/**
* Aux function to change the fireedge_token value.
@ -61,7 +61,7 @@ define(function (require) {
/**
* This function sets the fireedge_token variable if fireedge is running.
* If the Fireedge Server is not running the value of fireedge_token will
* If the FireEdge Server is not running the value of fireedge_token will
* be "".
*/
var _validate_fireedge_token = function(success, error) {
@ -71,31 +71,31 @@ define(function (require) {
type: "GET",
success: function(data) {
set_fireedge_token(data.token);
if (typeof success == "function"){
if (typeof success === "function"){
success(fireedge_token);
}
},
error: function(request, response, data) {
Notifier.onError(request, {error:{ message: "Fireedge private endpoint is not working, please contact your cloud administrator"}});
Notifier.onError(request, {error:{ message: "FireEdge private endpoint is not working, please contact your cloud administrator"}});
is_fireedge_configured = false;
clear_fireedge_token();
if (typeof error == "function"){
if (typeof error === "function"){
error();
}
}
});
}
else if (is_fireedge_configured){
if (typeof success == "function"){
if (typeof success === "function"){
success(fireedge_token);
}
}
else{
if (typeof error == "function"){
if (typeof error === "function"){
error();
}
}
}
};
var _check_fireedge_public_url = function (success, aux, error) {
if (fireedge_endpoint){
@ -104,14 +104,14 @@ define(function (require) {
type: "GET",
success: function() {
is_fireedge_configured = true;
if (typeof success == "function" && typeof aux == "function"){
if (typeof success === "function" && typeof aux === "function"){
success(aux);
}
},
error: function(request, response, data) {
Notifier.onError(request, {error:{ message: "Fireedge public endpoint is not working, please contact your cloud administrator"}});
Notifier.onError(request, {error:{ message: "FireEdge public endpoint is not working, please contact your cloud administrator"}});
is_fireedge_configured = false;
if (typeof error == "function"){
if (typeof error === "function"){
error();
}
}
@ -119,11 +119,11 @@ define(function (require) {
}
else {
is_fireedge_configured = false;
if (typeof error == "function"){
if (typeof error === "function"){
error();
}
}
}
};
var fireedge_validator = {
"validateFireedgeToken": _validate_fireedge_token,

4
src/sunstone/sunstone-server.rb
View File

@ -916,7 +916,7 @@ get '/vm/showback' do
end
##############################################################################
# GET Fireedge token
# GET FireEdge token
##############################################################################
get '/fireedge' do
begin
@ -934,7 +934,7 @@ get '/fireedge' do
response = {:token => fireedge_token}
[200, response.to_json]
rescue StandardError => error
logger.info("Fireedge server is not running. Error: #{error}")
logger.info("FireEdge server is not running. Error: #{error}")
response = {:token => ""}
[400, response.to_json]
end