Refactoring, Bugfix & Updates

+ Refactored all imports
+ Fixed a bug for the logging regarding removing \n \t \r
+ Updated to current MGO release
+ Changed the name of ICCC
This commit is contained in:
Thorsten Sommer 2014-10-19 19:19:11 +02:00
parent b50066ef5d
commit f33f7b5c29
91 changed files with 496 additions and 316 deletions

View File

@ -1,6 +1,8 @@
package Configuration
import "github.com/SommerEngineering/Ocean/Configuration/Meta"
import (
"github.com/SommerEngineering/Ocean/Configuration/Meta"
)
/*
Read the whole configuration and enable Ocean to get the configuration database.

View File

@ -1,10 +1,12 @@
package Configuration
import "encoding/json"
import "os"
import "path/filepath"
import "github.com/SommerEngineering/Ocean/Log"
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"encoding/json"
"github.com/SommerEngineering/Ocean/Log"
"github.com/SommerEngineering/Ocean/Log/Meta"
"os"
"path/filepath"
)
func readConfiguration() {

View File

@ -1,7 +1,9 @@
package Configuration
import "github.com/SommerEngineering/Ocean/Configuration/Meta"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Configuration/Meta"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
var (
filename = "configuration.json" // Where is the configuration located?

View File

@ -1,8 +1,10 @@
package ConfigurationDB
import "labix.org/v2/mgo/bson"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2/bson"
)
func checkConfiguration() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameDATABASE, `Check now the configuration database.`)

View File

@ -1,9 +1,11 @@
package ConfigurationDB
import "labix.org/v2/mgo"
import "github.com/SommerEngineering/Ocean/Configuration"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Configuration"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
)
func init() {

View File

@ -1,8 +1,10 @@
package ConfigurationDB
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import "labix.org/v2/mgo/bson"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2/bson"
)
/*
This function reads the current configuration value.

View File

@ -1,7 +1,9 @@
package ConfigurationDB
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
/*
Do not use this type by your own! It is a Ocean internal type to provide a shutdown function for the configuration database.

View File

@ -1,8 +1,10 @@
package ConfigurationDB
import "labix.org/v2/mgo"
import "github.com/SommerEngineering/Ocean/Configuration/Meta"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Configuration/Meta"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
)
var (
session *mgo.Session = nil

View File

@ -1,8 +1,10 @@
package ConfigurationDB
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import "labix.org/v2/mgo/bson"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2/bson"
)
/*
This function writes the configuration value.

View File

@ -1,6 +1,8 @@
package CustomerDB
import "labix.org/v2/mgo"
import (
"gopkg.in/mgo.v2"
)
/*
Get the database instance of the MGo Mongo driver.

View File

@ -1,9 +1,11 @@
package CustomerDB
import "labix.org/v2/mgo"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
)
func init() {

View File

@ -1,7 +1,9 @@
package CustomerDB
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
/*
Please do not use this type. It is an internal type of Ocean to provide a shutdown function!

View File

@ -1,7 +1,9 @@
package CustomerDB
import "labix.org/v2/mgo"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
)
var (
mainSession *mgo.Session = nil

View File

@ -1,8 +1,10 @@
package ICCC
import "fmt"
import "reflect"
import "strconv"
import (
"fmt"
"reflect"
"strconv"
)
func Data2Message(target interface{}, data map[string][]string) (channel, command string, obj interface{}) {
if data == nil || len(data) == 0 {

View File

@ -1,4 +1,4 @@
/*
This is the "[I]nter Data [C]enter and Appli[c]ation [C]ommunication"
This is the "[I]nter-[C]omponent [C]ommunication [C]hannel"
*/
package ICCC

View File

@ -1,10 +1,12 @@
package ICCC
import "fmt"
import "net/http"
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
"net/http"
)
func ICCCHandler(response http.ResponseWriter, request *http.Request) {
if errParse := request.ParseForm(); errParse != nil {

View File

@ -1,9 +1,11 @@
package ICCC
import "container/list"
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"container/list"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
)
func init() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameINIT, `Start init of ICCC.`)

View File

@ -1,9 +1,11 @@
package ICCC
import "labix.org/v2/mgo"
import "github.com/SommerEngineering/Ocean/CustomerDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/CustomerDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
)
func initDB() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameINIT, `Start init of the ICCC collections.`)

View File

@ -1,12 +1,14 @@
package ICCC
import "fmt"
import "time"
import "labix.org/v2/mgo/bson"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/ICCC/Scheme"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
"gopkg.in/mgo.v2/bson"
"time"
)
func InitCacheNow() {
startCacheTimerLock.Lock()

View File

@ -1,8 +1,10 @@
package ICCC
import "fmt"
import "reflect"
import "strconv"
import (
"fmt"
"reflect"
"strconv"
)
func message2Data(channel, command string, message interface{}) (data map[string][]string) {
data = make(map[string][]string)

View File

@ -1,9 +1,11 @@
package ICCC
import "labix.org/v2/mgo/bson"
import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC/Scheme"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2/bson"
)
func register2Database(channel, command string) {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Register this ICCC command in to the database.`, `channel=`+channel, `command=`+command)

View File

@ -1,10 +1,12 @@
package ICCC
import "labix.org/v2/mgo/bson"
import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC/Scheme"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
"gopkg.in/mgo.v2/bson"
)
func registerHost2Database() {
host := Scheme.Host{}

View File

@ -1,8 +1,10 @@
package ICCC
import "fmt"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
func Registrar(channel, command string, callback func(data map[string][]string)) {
listenersLock.Lock()

View File

@ -1,11 +1,13 @@
package ICCC
import "net/http"
import "net/url"
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC/Scheme"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
"net/http"
"net/url"
)
func sendMessage(listener Scheme.Listener, data map[string][]string) {

View File

@ -1,9 +1,11 @@
package ICCC
import "labix.org/v2/mgo/bson"
import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC/Scheme"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2/bson"
)
/*
Please do not use this type. It is an internal type of Ocean to provide a shutdown function!

View File

@ -1,9 +1,11 @@
package ICCC
import "sync"
import "container/list"
import "labix.org/v2/mgo"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"container/list"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
"sync"
)
const (
ChannelSYSTEM string = `System`

View File

@ -1,8 +1,10 @@
package ICCC
import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC/Scheme"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
func WriteMessage2All(channel, command string, message interface{}) {
cacheListenerDatabaseLock.RLock()

View File

@ -1,9 +1,11 @@
package ICCC
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC/Scheme"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
)
func WriteMessage2Any(channel, command string, message interface{}) {
cacheListenerDatabaseLock.RLock()

View File

@ -1,6 +1,8 @@
package Log
import "github.com/SommerEngineering/Ocean/Log/Device"
import (
"github.com/SommerEngineering/Ocean/Log/Device"
)
/*
Registering the logging devices. Normally, it is not necessary to call this function. To enable or disable a logging device,

View File

@ -1,7 +1,9 @@
package Log
import "container/list"
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"container/list"
"github.com/SommerEngineering/Ocean/Log/Meta"
)
func logEntryListToArray(data *list.List) (result []Meta.Entry) {
count := data.Len()

View File

@ -1,6 +1,8 @@
package Device
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log/Meta"
)
type Device interface {
Log(logEntries []Meta.Entry)

View File

@ -1,6 +1,8 @@
package DeviceConsole
import "github.com/SommerEngineering/Ocean/Log"
import (
"github.com/SommerEngineering/Ocean/Log"
)
func ActivateLoggingDevice() {
Log.AddLoggingDevice(Console{})

View File

@ -1,7 +1,9 @@
package DeviceConsole
import "fmt"
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log/Meta"
)
type Console struct {
}

View File

@ -1,6 +1,8 @@
package DeviceDatabase
import "github.com/SommerEngineering/Ocean/Log"
import (
"github.com/SommerEngineering/Ocean/Log"
)
func ActivateLoggingDevice() {
Log.AddLoggingDevice(Database{})

View File

@ -1,10 +1,12 @@
package DeviceDatabase
import "strconv"
import "fmt"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"strconv"
)
func init() {

View File

@ -1,9 +1,11 @@
package DeviceDatabase
import "labix.org/v2/mgo"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
)
func initDatabase() {

View File

@ -1,7 +1,9 @@
package DeviceDatabase
import "time"
import "github.com/SommerEngineering/Ocean/Shutdown"
import (
"github.com/SommerEngineering/Ocean/Shutdown"
"time"
)
// Case: The cache is full
func cacheFull() {

View File

@ -1,6 +1,8 @@
package DeviceDatabase
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log/Meta"
)
type Database struct {
}

View File

@ -1,6 +1,8 @@
package DeviceDatabase
import "time"
import (
"time"
)
type LogDBEntry struct {
TimeUTC time.Time `bson:"TimeUTC"`

View File

@ -1,8 +1,10 @@
package DeviceDatabase
import "sync"
import "labix.org/v2/mgo"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
"sync"
)
var (
senderName LM.Sender = `System::Logger::Database`

View File

@ -1,6 +1,8 @@
package DeviceDatabase
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log/Meta"
)
func write2Cache(entries []Meta.Entry) {
for _, entry := range entries {

View File

@ -1,7 +1,9 @@
package Log
import "github.com/SommerEngineering/Ocean/Log/Meta"
import "github.com/SommerEngineering/Ocean/Log/Device"
import (
"github.com/SommerEngineering/Ocean/Log/Device"
"github.com/SommerEngineering/Ocean/Log/Meta"
)
func deviceDelay(newEntry Meta.Entry) {
defer checkDeviceDelaySize()

View File

@ -1,7 +1,9 @@
package Log
import "time"
import "github.com/SommerEngineering/Ocean/Log/Device"
import (
"github.com/SommerEngineering/Ocean/Log/Device"
"time"
)
/*
Please do not call this function your self! This function allows Ocean to flush the logging at the shutting down case.

View File

@ -1,9 +1,11 @@
package Log
import "time"
import "fmt"
import "strings"
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log/Meta"
"strings"
"time"
)
func writeToChannel(logEntry Meta.Entry) {
select {

View File

@ -1,13 +1,15 @@
package Log
import "github.com/SommerEngineering/Ocean/Log/Meta"
import "strconv"
import "container/list"
import "sync"
import "path/filepath"
import "os"
import "io/ioutil"
import "strings"
import (
"container/list"
"github.com/SommerEngineering/Ocean/Log/Meta"
"io/ioutil"
"os"
"path/filepath"
"strconv"
"strings"
"sync"
)
func readProjectName() {
if currentDir, dirError := os.Getwd(); dirError != nil {

View File

@ -1,6 +1,8 @@
package Meta
import "time"
import (
"time"
)
type Entry struct {
Project string

View File

@ -1,9 +1,11 @@
package Meta
import "fmt"
import "time"
import "strconv"
import "strings"
import (
"fmt"
"strconv"
"strings"
"time"
)
func (entry Entry) Format() (result string) {
@ -23,18 +25,18 @@ func (entry Entry) Format() (result string) {
}
messageDescription := entry.MessageDescription
messageDescription = strings.Replace(messageDescription, `\n`, ` `, -1)
messageDescription = strings.Replace(messageDescription, `\t`, ` `, -1)
messageDescription = strings.Replace(messageDescription, `\r`, ` `, -1)
messageDescription = strings.Replace(messageDescription, "\n", ` `, -1)
messageDescription = strings.Replace(messageDescription, "\t", ` `, -1)
messageDescription = strings.Replace(messageDescription, "\r", ` `, -1)
result = fmt.Sprintf(` [■] P:%10s [■] %s [■] %10s [■] %11s [■] %10s [■] %10s [■] sender: %-40s [■] name: %-26s [■] %s [■]`, entry.Project[:lenProject], formatTime(entry.Time), FormatCategory(entry.Category), FormatLevel(entry.Level), FormatSeverity(entry.Severity), FormatImpact(entry.Impact), entry.Sender[:lenSender], entry.MessageName[:lenMessageName], messageDescription)
for _, param := range entry.Parameters {
paramText := param
paramText = strings.Replace(paramText, `\n`, ` `, -1)
paramText = strings.Replace(paramText, `\t`, ` `, -1)
paramText = strings.Replace(paramText, `\r`, ` `, -1)
paramText = strings.Replace(paramText, "\n", ` `, -1)
paramText = strings.Replace(paramText, "\t", ` `, -1)
paramText = strings.Replace(paramText, "\r", ` `, -1)
result = fmt.Sprintf(`%s %s [■]`, result, paramText)
}

View File

@ -1,7 +1,9 @@
package Log
import "github.com/SommerEngineering/Ocean/Log/Meta"
import "time"
import (
"github.com/SommerEngineering/Ocean/Log/Meta"
"time"
)
// Note: The scheduler is the consumer for the logging channel!
func scheduler(logBuffer chan Meta.Entry) {

View File

@ -1,9 +1,11 @@
package Log
import "time"
import "fmt"
import "github.com/SommerEngineering/Ocean/Log/Device"
import "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log/Device"
"github.com/SommerEngineering/Ocean/Log/Meta"
"time"
)
func initTimer() {

View File

@ -1,8 +1,10 @@
package Log
import "github.com/SommerEngineering/Ocean/Log/Meta"
import "container/list"
import "sync"
import (
"container/list"
"github.com/SommerEngineering/Ocean/Log/Meta"
"sync"
)
var (
entriesBuffer chan Meta.Entry = nil

View File

@ -1,6 +1,8 @@
package MimeTypes
import "strings"
import (
"strings"
)
type MimeType struct {
MimeType string

View File

@ -1,6 +1,8 @@
package MimeTypes
import "net/http"
import (
"net/http"
)
func Write2HTTP(response http.ResponseWriter, mime MimeType) {
response.Header().Add(`Content-Type`, mime.MimeType)

View File

@ -1,11 +1,13 @@
package NumGen
import "net/http"
import "net/url"
import "strconv"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
"net/http"
"net/url"
"strconv"
)
func GetNextInt64(name string) (result int64) {
result = badNumber64

View File

@ -1,10 +1,12 @@
package NumGen
import "fmt"
import "net/http"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
"net/http"
)
func HandlerGetNext(response http.ResponseWriter, request *http.Request) {
if Shutdown.IsDown() {

View File

@ -1,11 +1,13 @@
package NumGen
import "strings"
import "strconv"
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
"strconv"
"strings"
)
func init() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Init the number generator.`)

View File

@ -1,9 +1,11 @@
package NumGen
import "labix.org/v2/mgo"
import "github.com/SommerEngineering/Ocean/CustomerDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/CustomerDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
)
func initDB() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameINIT, `Start init of number generator collection.`)

View File

@ -1,10 +1,12 @@
package NumGen
import "time"
import "labix.org/v2/mgo/bson"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
"gopkg.in/mgo.v2/bson"
"time"
)
func producer(name string) {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `The NumGen producer is now starting.`, `name=`+name)

View File

@ -1,8 +1,10 @@
package NumGen
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
)
func requestChannel4Name(name string) (result chan int64) {

View File

@ -1,7 +1,9 @@
package NumGen
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
type ShutdownFunction struct {
}

View File

@ -1,8 +1,10 @@
package NumGen
import "sync"
import "labix.org/v2/mgo"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"gopkg.in/mgo.v2"
"sync"
)
var (
correctPassword string = ``

View File

@ -1,10 +1,12 @@
package Robots
import "fmt"
import "net/http"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
"net/http"
)
func HandlerRobots(response http.ResponseWriter, request *http.Request) {
if Shutdown.IsDown() {

View File

@ -1,8 +1,10 @@
package Robots
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
func init() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Init the robots component.`)

View File

@ -1,6 +1,8 @@
package Robots
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
var (
senderName LM.Sender = `System::Robots`

View File

@ -1,8 +1,10 @@
package Shutdown
import "container/list"
import "os/signal"
import "os"
import (
"container/list"
"os"
"os/signal"
)
func init() {
shutdownHandlers = list.New()

View File

@ -1,8 +1,10 @@
package Shutdown
import "os"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"os"
)
type ShutdownHandler interface {
Shutdown()

View File

@ -1,8 +1,10 @@
package Shutdown
import "os"
import "container/list"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"container/list"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"os"
)
var (
shutdownSignal chan os.Signal = make(chan os.Signal)

View File

@ -1,11 +1,13 @@
package StaticFiles
import "io/ioutil"
import "bytes"
import "archive/zip"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"archive/zip"
"bytes"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
"io/ioutil"
)
func FindAndReadFile(filename string) (result []byte) {
if Shutdown.IsDown() {

View File

@ -1,12 +1,14 @@
package StaticFiles
import "fmt"
import "strings"
import "net/http"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/MimeTypes"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/MimeTypes"
"github.com/SommerEngineering/Ocean/Shutdown"
"net/http"
"strings"
)
func HandlerStaticFiles(response http.ResponseWriter, request *http.Request) {
if Shutdown.IsDown() {

View File

@ -1,10 +1,12 @@
package StaticFiles
import "io/ioutil"
import "github.com/SommerEngineering/Ocean/CustomerDB"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/CustomerDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"io/ioutil"
)
func init() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Starting now the static files component.`)

View File

@ -1,7 +1,9 @@
package StaticFiles
import "net/http"
import "github.com/SommerEngineering/Ocean/Shutdown"
import (
"github.com/SommerEngineering/Ocean/Shutdown"
"net/http"
)
func HandlerMapStaticFiles2Root(response http.ResponseWriter, request *http.Request) {
if Shutdown.IsDown() {

View File

@ -1,6 +1,8 @@
package StaticFiles
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
var (
senderName LM.Sender = `System::StaticFiles`

View File

@ -1,8 +1,10 @@
package System
import "github.com/SommerEngineering/Ocean/ICCC"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
func icccSystemStart(data map[string][]string) {
_, _, obj := ICCC.Data2Message(&ICCCStartUpMessage{}, data)

View File

@ -1,15 +1,17 @@
package System
import "fmt"
import "runtime"
import "strconv"
import "github.com/SommerEngineering/Ocean/ICCC"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/CustomerDB"
import "github.com/SommerEngineering/Ocean/NumGen"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"fmt"
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/CustomerDB"
"github.com/SommerEngineering/Ocean/ICCC"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/NumGen"
"github.com/SommerEngineering/Ocean/Shutdown"
"runtime"
"strconv"
)
func initSystem() {

View File

@ -1,14 +1,16 @@
package System
import "net/http"
import "github.com/SommerEngineering/Ocean/ICCC"
import "github.com/SommerEngineering/Ocean/WebContent"
import "github.com/SommerEngineering/Ocean/StaticFiles"
import "github.com/SommerEngineering/Ocean/NumGen"
import "github.com/SommerEngineering/Ocean/Robots"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/ICCC"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/NumGen"
"github.com/SommerEngineering/Ocean/Robots"
"github.com/SommerEngineering/Ocean/StaticFiles"
"github.com/SommerEngineering/Ocean/WebContent"
"net/http"
)
func InitHandlers() {

View File

@ -1,10 +1,12 @@
package System
import "github.com/SommerEngineering/Ocean/Log/DeviceConsole"
import "github.com/SommerEngineering/Ocean/Log/DeviceDatabase"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/Log"
"github.com/SommerEngineering/Ocean/Log/DeviceConsole"
"github.com/SommerEngineering/Ocean/Log/DeviceDatabase"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
func initLoggingDevices() {

View File

@ -1,10 +1,12 @@
package System
import "net/http"
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/ICCC"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ICCC"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
"net/http"
)
func StartAndBlockForever() {
ipAddressPort := Tools.LocalIPAddressAndPort()

View File

@ -1,6 +1,8 @@
package System
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
var (
senderName LM.Sender = `System::System`

View File

@ -1,14 +1,16 @@
package Templates
import "fmt"
import "bytes"
import "html/template"
import "io/ioutil"
import "archive/zip"
import "github.com/SommerEngineering/Ocean/CustomerDB"
import "github.com/SommerEngineering/Ocean/Tools"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"archive/zip"
"bytes"
"fmt"
"github.com/SommerEngineering/Ocean/CustomerDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Tools"
"html/template"
"io/ioutil"
)
func init() {
Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Starting the template engine.`)

View File

@ -1,9 +1,11 @@
package Templates
import "net/http"
import "github.com/SommerEngineering/Ocean/MimeTypes"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/MimeTypes"
"net/http"
)
func ProcessHTML(templateName string, response http.ResponseWriter, data interface{}) {

View File

@ -1,7 +1,9 @@
package Templates
import "html/template"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"html/template"
)
var (
templates *template.Template = nil

View File

@ -1,8 +1,10 @@
package Tools
import "time"
import "fmt"
import "strconv"
import (
"fmt"
"strconv"
"time"
)
func FormatTime(t1 time.Time) (result string) {
var year int = t1.Year()

View File

@ -1,7 +1,9 @@
package Tools
import "net"
import "strings"
import (
"net"
"strings"
)
func ReadAllIPAddresses4ThisHost() (addresses4Host []string) {
addresses4Host = ipAddresses

View File

@ -1,11 +1,13 @@
package Tools
import "os"
import "time"
import "math/rand"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"math/rand"
"os"
"time"
)
func init() {
// Get this hostname:

View File

@ -1,6 +1,8 @@
package Tools
import "math/rand"
import (
"math/rand"
)
func RandomInteger(max int) (rnd int) {
rnd = rand.Intn(max)

View File

@ -1,6 +1,8 @@
package Tools
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
var (
senderName LM.Sender = `System::Tools`

View File

@ -1,11 +1,13 @@
package WebContent
import "errors"
import "archive/zip"
import "io/ioutil"
import "bytes"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"archive/zip"
"bytes"
"errors"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"io/ioutil"
)
func GetContent(path string) (content []byte, err error) {

View File

@ -1,10 +1,12 @@
package WebContent
import "net/http"
import "strings"
import "github.com/SommerEngineering/Ocean/Shutdown"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/Shutdown"
"net/http"
"strings"
)
func HandlerDeliverFramework(response http.ResponseWriter, request *http.Request) {
if Shutdown.IsDown() {

View File

@ -1,10 +1,12 @@
package WebContent
import "io/ioutil"
import "github.com/SommerEngineering/Ocean/CustomerDB"
import "github.com/SommerEngineering/Ocean/ConfigurationDB"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"github.com/SommerEngineering/Ocean/ConfigurationDB"
"github.com/SommerEngineering/Ocean/CustomerDB"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"io/ioutil"
)
func init() {

View File

@ -1,12 +1,14 @@
package WebContent
import "net/http"
import "bytes"
import "errors"
import "fmt"
import "github.com/SommerEngineering/Ocean/MimeTypes"
import "github.com/SommerEngineering/Ocean/Log"
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
"bytes"
"errors"
"fmt"
"github.com/SommerEngineering/Ocean/Log"
LM "github.com/SommerEngineering/Ocean/Log/Meta"
"github.com/SommerEngineering/Ocean/MimeTypes"
"net/http"
)
func SendContent(response http.ResponseWriter, path string) (err error) {

View File

@ -1,6 +1,8 @@
package WebContent
import LM "github.com/SommerEngineering/Ocean/Log/Meta"
import (
LM "github.com/SommerEngineering/Ocean/Log/Meta"
)
var (
isInit = false

2
history.dat Normal file
View File

@ -0,0 +1,2 @@
3507|121819|2014.09.17 18:52:28:598
3685|121093|2014.10.19 17:10:51:188