kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed the syslog package to logcollector

Browse Source
This commit is contained in:
Diptanu Choudhury
2016-02-10 18:47:46 -08:00
parent 65d5bdd746
commit 6c27ae6b91
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/driver/docker.go
View File

@@ -19,8 +19,8 @@ import (
"github.com/hashicorp/nomad/client/allocdir"
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/client/driver/logcollector"
cstructs "github.com/hashicorp/nomad/client/driver/structs"
"github.com/hashicorp/nomad/client/driver/syslog"
"github.com/hashicorp/nomad/client/fingerprint"
"github.com/hashicorp/nomad/helper/discover"
"github.com/hashicorp/nomad/nomad/structs"
@@ -82,7 +82,7 @@ type dockerPID struct {
type DockerHandle struct {
pluginClient *plugin.Client
logCollector syslog.LogCollector
logCollector logcollector.LogCollector
client *docker.Client
logger *log.Logger
cleanupContainer bool
@@ -503,7 +503,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
if err != nil {
return nil, err
}
logCollectorCtx := &syslog.LogCollectorContext{
logCollectorCtx := &logcollector.LogCollectorContext{
TaskName: task.Name,
AllocDir: ctx.AllocDir,
LogConfig: task.LogConfig,

6
client/driver/syslog/collector.go → client/driver/logcollector/collector.go
View File

@@ -1,4 +1,4 @@
package syslog
package logcollector
import (
"fmt"
@@ -119,8 +119,8 @@ func (s *SyslogCollector) LaunchCollector(ctx *LogCollectorContext) (*SyslogColl
for logParts := range channel {
// If the severity of the log line is err then we write to stderr
// otherwise all messages go to stdout
s := logParts["severity"].(s1.Priority)
if s == s1.LOG_ERR {
s := logParts["severity"].(Priority)
if s.Severity == s1.LOG_ERR {
we.Write(logParts["content"].([]byte))
} else {
wo.Write(logParts["content"].([]byte))

2
client/driver/syslog/parser.go → client/driver/logcollector/parser.go
View File

@@ -1,4 +1,4 @@
package syslog
package logcollector
import (
"bufio"

6
client/driver/syslog/parser_test.go → client/driver/logcollector/parser_test.go
View File

@@ -1,4 +1,4 @@
package syslog
package logcollector
import (
"log/syslog"
@@ -12,8 +12,8 @@ func TestLogParser_Priority(t *testing.T) {
if err != nil {
t.Fatalf("got an err: %v", err)
}
if p.S != syslog.LOG_INFO {
t.Fatalf("expected serverity: %v, got: %v", syslog.LOG_INFO, p.S)
if p.Severity != syslog.LOG_INFO {
t.Fatalf("expected serverity: %v, got: %v", syslog.LOG_INFO, p.Severity)
}
idx := d.logContentIndex(line)

14
client/driver/syslog_plugin.go
View File

@@ -5,7 +5,7 @@ import (
"net/rpc"
"github.com/hashicorp/go-plugin"
"github.com/hashicorp/nomad/client/driver/syslog"
"github.com/hashicorp/nomad/client/driver/logcollector"
"github.com/hashicorp/nomad/nomad/structs"
)
@@ -14,11 +14,11 @@ type SyslogCollectorRPC struct {
}
type LaunchCollectorArgs struct {
Ctx *syslog.LogCollectorContext
Ctx *logcollector.LogCollectorContext
}
func (e *SyslogCollectorRPC) LaunchCollector(ctx *syslog.LogCollectorContext) (*syslog.SyslogCollectorState, error) {
var ss *syslog.SyslogCollectorState
func (e *SyslogCollectorRPC) LaunchCollector(ctx *logcollector.LogCollectorContext) (*logcollector.SyslogCollectorState, error) {
var ss *logcollector.SyslogCollectorState
err := e.client.Call("Plugin.LaunchCollector", LaunchCollectorArgs{Ctx: ctx}, &ss)
return ss, err
}
@@ -32,11 +32,11 @@ func (e *SyslogCollectorRPC) UpdateLogConfig(logConfig *structs.LogConfig) error
}
type SyslogCollectorRPCServer struct {
Impl syslog.LogCollector
Impl logcollector.LogCollector
}
func (s *SyslogCollectorRPCServer) LaunchCollector(args LaunchCollectorArgs,
resp *syslog.SyslogCollectorState) error {
resp *logcollector.SyslogCollectorState) error {
ss, err := s.Impl.LaunchCollector(args.Ctx)
if ss != nil {
*resp = *ss
@@ -59,7 +59,7 @@ type SyslogCollectorPlugin struct {
func (p *SyslogCollectorPlugin) Server(*plugin.MuxBroker) (interface{}, error) {
if p.Impl == nil {
p.Impl = &SyslogCollectorRPCServer{Impl: syslog.NewSyslogCollector(p.logger)}
p.Impl = &SyslogCollectorRPCServer{Impl: logcollector.NewSyslogCollector(p.logger)}
}
return p.Impl, nil
}

6
client/driver/utils.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/hashicorp/go-plugin"
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/client/driver/executor"
"github.com/hashicorp/nomad/client/driver/syslog"
"github.com/hashicorp/nomad/client/driver/logcollector"
)
// createExecutor launches an executor plugin and returns an instance of the
@@ -42,7 +42,7 @@ func createExecutor(config *plugin.ClientConfig, w io.Writer,
}
func createLogCollector(config *plugin.ClientConfig, w io.Writer,
clientConfig *config.Config) (syslog.LogCollector, *plugin.Client, error) {
clientConfig *config.Config) (logcollector.LogCollector, *plugin.Client, error) {
config.HandshakeConfig = HandshakeConfig
config.Plugins = GetPluginMap(w)
config.MaxPort = clientConfig.ClientMaxPort
@@ -61,7 +61,7 @@ func createLogCollector(config *plugin.ClientConfig, w io.Writer,
if err != nil {
return nil, nil, fmt.Errorf("unable to dispense the syslog plugin: %v", err)
}
logCollector := raw.(syslog.LogCollector)
logCollector := raw.(logcollector.LogCollector)
return logCollector, syslogClient, nil
}