Go/Ocean
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented the logging viewer

Browse Source
This commit is contained in:
Thorsten Sommer committed 2015-06-23 17:22:24 +02:00
1 parent 3257fe2f32
commit c5633d84f4
10 files changed
+164 -145
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Log/Web/HandlerLog.go
+25 -16
View File
@@ -65,13 +65,26 @@ func HandlerWebLog(response http.ResponseWriter, request *http.Request) {
currentPage := request.FormValue(`CurrentPage`)
currentLiveView := request.FormValue(`LiveView`)
// Get the current page as number:
if currentPage != `` {
if number, err := strconv.Atoi(currentPage); err != nil {
Log.LogFull(senderName, LM.CategorySYSTEM, LM.LevelERROR, LM.SeverityNone, LM.ImpactNone, LM.MessageNameEXECUTE, `Was not able to parse the page number.`, err.Error())
} else {
currentPageNumber = number
}
}
// Store the events for the template:
data.Events, lastPageNumber = readCustom(currentTimeRange, currentLevel, currentCategory, currentImpact, currentSeverity, currentMessageName, currentSender, currentPage)
data.Events, lastPageNumber = readCustom(currentTimeRange, currentLevel, currentCategory, currentImpact, currentSeverity, currentMessageName, currentSender, currentPageNumber)
if strings.ToLower(currentLiveView) == `true` {
data.SetLiveView = true
}
//
// Correct the form's values to '*' for the any-case:
//
if currentLevel != `` {
data.CurrentLevel = currentLevel
} else {
@@ -114,24 +127,20 @@ func HandlerWebLog(response http.ResponseWriter, request *http.Request) {
data.CurrentSender = `*`
}
// Calculate the current, last, previous and next page:
if currentPage != `` {
if number, err := strconv.Atoi(currentPage); err != nil {
Log.LogFull(senderName, LM.CategorySYSTEM, LM.LevelERROR, LM.SeverityNone, LM.ImpactNone, LM.MessageNameEXECUTE, `Was not able to parse the page number.`, err.Error())
data.CurrentPage = fmt.Sprintf("%d", currentPageNumber)
data.LastPage = fmt.Sprintf("%d", lastPageNumber)
if currentPageNumber+1 > lastPageNumber {
data.NextPage = fmt.Sprintf("%d", lastPageNumber)
} else {
currentPageNumber = number
data.CurrentPage = fmt.Sprintf("%d", currentPageNumber)
data.LastPage = fmt.Sprintf("%d", lastPageNumber)
if currentPageNumber+1 > lastPageNumber {
data.NextPage = fmt.Sprintf("%d", lastPageNumber)
} else {
data.NextPage = fmt.Sprintf("%d", currentPageNumber+1)
}
data.NextPage = fmt.Sprintf("%d", currentPageNumber+1)
}
if currentPageNumber > 1 {
data.PreviousPage = fmt.Sprintf("%d", currentPageNumber-1)
} else {
data.PreviousPage = `1`
}
if currentPageNumber > 1 {
data.PreviousPage = fmt.Sprintf("%d", currentPageNumber-1)
} else {
data.PreviousPage = `1`
}
data.CurrentPage = currentPage
} else {
Log/Web/ReadCustom.go
+8 -2
View File
@@ -8,7 +8,7 @@ import (
)
// Read a custom event range from the database.
func readCustom(timeRange, logLevel, logCategory, logImpact, logSeverity, logMessageName, logSender, logPage string) (events []Scheme.LogEvent, numPages int) {
func readCustom(timeRange, logLevel, logCategory, logImpact, logSeverity, logMessageName, logSender string, logPage int) (events []Scheme.LogEvent, numPages int) {
// Get the custom events:
eventsFromDB, totalNumberPages := DeviceDatabase.ReadCustom(timeRange, logLevel, logCategory, logImpact, logSeverity, logMessageName, logSender, logPage)
@@ -22,7 +22,13 @@ func readCustom(timeRange, logLevel, logCategory, logImpact, logSeverity, logMes
eventFromDB := eventsFromDB[n]
events[n] = Scheme.LogEvent{}
events[n].LogLine = eventFromDB.Format()
events[n].LogLevel = fmt.Sprintf("log%s", strings.ToLower(eventFromDB.Level[2:]))
// Transfer the log level:
if len(eventFromDB.Level) > 2 {
events[n].LogLevel = fmt.Sprintf("log%s", strings.ToLower(eventFromDB.Level[2:]))
} else {
events[n].LogLevel = fmt.Sprintf("log%s", strings.ToLower(eventFromDB.Level))
}
// Vary the color of each line:
if n%2 == 0 {