Add possibility to provide version (#46)

This commit is contained in:
Thorsten Sommer committed 2015-07-10 16:20:10 +02:00
1 parent 44b236e2ef
commit 20b93f42d4
17 files changed
+122 -4

No files matched your search

@@ -29,7 +29,7 @@ func icccComponentStartUpMessageReceiver(data map[string][]string) (result map[s
messageData := obj.(SystemMessages.ICCCComponentStartUpMessage)
// Provide a log entry:
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `ICCC message: The external component is now up and ready.`, fmt.Sprintf("ipAddressPort=%s", messageData.IPAddressPort))
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `ICCC message: The external component is now up and ready.`, fmt.Sprintf("ipAddressPort=%s", messageData.IPAddressPort), fmt.Sprintf("name=", messageData.Name), fmt.Sprintf("version=", messageData.Version))
// An answer is necessary:
return ICCC.Message2Data("", "", SystemMessages.AnswerACK)
+1 -1
View File
@@ -29,7 +29,7 @@ func icccOceanStartUpMessageReceiver(data map[string][]string) (result map[strin
messageData := obj.(SystemMessages.ICCCOceanStartUpMessage)
// Provide a log entry:
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `ICCC message: The Ocean server is now up and ready.`, fmt.Sprintf("public server=%s", messageData.PublicIPAddressPort), fmt.Sprintf("admin server=%s", messageData.AdminIPAddressPort))
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `ICCC message: The Ocean server is now up and ready.`, fmt.Sprintf("public server=%s", messageData.PublicIPAddressPort), fmt.Sprintf("admin server=%s", messageData.AdminIPAddressPort), fmt.Sprintf("Ocean's version=%s", messageData.OceanVersion))
// An answer is necessary:
return ICCC.Message2Data("", "", SystemMessages.AnswerACK)
+4
View File
@@ -11,6 +11,7 @@ import (
"github.com/SommerEngineering/Ocean/Log/Web"
"github.com/SommerEngineering/Ocean/Robots"
"github.com/SommerEngineering/Ocean/StaticFiles"
"github.com/SommerEngineering/Ocean/System/Version"
"github.com/SommerEngineering/Ocean/WebContent"
)
@@ -58,6 +59,9 @@ func InitHandlers() {
// Handler for the web logging:
Handlers.AddAdminHandler(`/log`, Web.HandlerWebLog)
// Handler for the access to Ocean's version:
Handlers.AddAdminHandler(`/version`, Version.HandlerVersion)
// Handler for the file upload:
Handlers.AddAdminHandler(`/upload`, Admin.HandlerFileUpload)
+2 -1
View File
@@ -104,7 +104,8 @@ func initSystem() {
ICCC.Registrar(ICCC.ChannelICCC, `ICCC::DeleteListener`, ICCC.ICCCDeleteListenerReceiver)
ICCC.Registrar(ICCC.ChannelICCC, `ICCC::DeleteHost`, ICCC.ICCCDeleteHostReceiver)
ICCC.Registrar(ICCC.ChannelICCC, `ICCC::ListenerUpdate`, ICCC.ICCCListenerUpdateReceiver)
ICCC.Registrar(ICCC.ChannelICCC, `ICCC::Ping`, ICCC.ICCCPingReceiver)
ICCC.Registrar(ICCC.ChannelICCC, `Ping::Ping`, ICCC.ICCCPingReceiver)
ICCC.Registrar(ICCC.ChannelSYSTEM, `System::Version`, ICCC.ICCCGetVersionReceiver)
ICCC.Registrar(ICCC.ChannelICCC, `ICCC::GetHosts`, ICCC.ICCCGetHostsReceiver)
ICCC.Registrar(ICCC.ChannelICCC, `ICCC::GetListeners`, ICCC.ICCCGetListenersReceiver)
ICCC.Registrar(ICCC.ChannelNUMGEN, `NumGen::Next`, NumGen.ICCCNextNumberReceiver)
+6
View File
@@ -0,0 +1,6 @@
package Version
// Gets Ocean's version
func GetVersion() string {
return oceansVersion
}
+19
View File
@@ -0,0 +1,19 @@
package Version
import (
"fmt"
"github.com/SommerEngineering/Ocean/Shutdown"
"net/http"
)
// Handler for the access to Ocean's version
func HandlerVersion(response http.ResponseWriter, request *http.Request) {
// Case: The system goes down now?
if Shutdown.IsDown() {
http.NotFound(response, request)
return
}
fmt.Fprintf(response, "%s", oceansVersion)
}
+5
View File
@@ -0,0 +1,5 @@
package Version
var (
oceansVersion string = `2.0.0` // Ocean's current version
)