From 3ba626df7278d97db4c53c6bcdd520eb66f15658 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Fri, 19 Feb 2016 13:08:25 -0800 Subject: [PATCH] Renamed packages --- client/driver/docker.go | 6 +++--- .../{logcollector => logging}/collector_windows.go | 2 +- .../parser.go => logging/syslog_parser.go} | 2 +- .../syslog_parser_test.go} | 2 +- .../server.go => logging/syslog_server.go} | 2 +- .../universal_collector.go | 2 +- client/driver/syslog_plugin.go | 14 +++++++------- client/driver/utils.go | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) rename client/driver/{logcollector => logging}/collector_windows.go (98%) rename client/driver/{logcollector/parser.go => logging/syslog_parser.go} (99%) rename client/driver/{logcollector/parser_test.go => logging/syslog_parser_test.go} (97%) rename client/driver/{logcollector/server.go => logging/syslog_server.go} (98%) rename client/driver/{logcollector => logging}/universal_collector.go (99%) diff --git a/client/driver/docker.go b/client/driver/docker.go index abe756f8e..bf0be1963 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/nomad/client/allocdir" "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/driver/logcollector" + "github.com/hashicorp/nomad/client/driver/logging" cstructs "github.com/hashicorp/nomad/client/driver/structs" "github.com/hashicorp/nomad/client/fingerprint" "github.com/hashicorp/nomad/helper/discover" @@ -82,7 +82,7 @@ type dockerPID struct { type DockerHandle struct { pluginClient *plugin.Client - logCollector logcollector.LogCollector + logCollector logging.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 := &logcollector.LogCollectorContext{ + logCollectorCtx := &logging.LogCollectorContext{ TaskName: task.Name, AllocDir: ctx.AllocDir, LogConfig: task.LogConfig, diff --git a/client/driver/logcollector/collector_windows.go b/client/driver/logging/collector_windows.go similarity index 98% rename from client/driver/logcollector/collector_windows.go rename to client/driver/logging/collector_windows.go index e13c04b2b..272b68cf2 100644 --- a/client/driver/logcollector/collector_windows.go +++ b/client/driver/logging/collector_windows.go @@ -1,4 +1,4 @@ -package logcollector +package logging import ( "log" diff --git a/client/driver/logcollector/parser.go b/client/driver/logging/syslog_parser.go similarity index 99% rename from client/driver/logcollector/parser.go rename to client/driver/logging/syslog_parser.go index 90cd1144d..72d73c43d 100644 --- a/client/driver/logcollector/parser.go +++ b/client/driver/logging/syslog_parser.go @@ -1,6 +1,6 @@ // +build !windows -package logcollector +package logging import ( "fmt" diff --git a/client/driver/logcollector/parser_test.go b/client/driver/logging/syslog_parser_test.go similarity index 97% rename from client/driver/logcollector/parser_test.go rename to client/driver/logging/syslog_parser_test.go index dd43379ed..55503eee9 100644 --- a/client/driver/logcollector/parser_test.go +++ b/client/driver/logging/syslog_parser_test.go @@ -1,6 +1,6 @@ // +build !windows -package logcollector +package logging import ( "log/syslog" diff --git a/client/driver/logcollector/server.go b/client/driver/logging/syslog_server.go similarity index 98% rename from client/driver/logcollector/server.go rename to client/driver/logging/syslog_server.go index 9fb485657..24e159a3f 100644 --- a/client/driver/logcollector/server.go +++ b/client/driver/logging/syslog_server.go @@ -1,4 +1,4 @@ -package logcollector +package logging import ( "bufio" diff --git a/client/driver/logcollector/universal_collector.go b/client/driver/logging/universal_collector.go similarity index 99% rename from client/driver/logcollector/universal_collector.go rename to client/driver/logging/universal_collector.go index 96d47cf96..718d4d37d 100644 --- a/client/driver/logcollector/universal_collector.go +++ b/client/driver/logging/universal_collector.go @@ -1,6 +1,6 @@ // +build !windows -package logcollector +package logging import ( "fmt" diff --git a/client/driver/syslog_plugin.go b/client/driver/syslog_plugin.go index b4cee69fb..55237cd2d 100644 --- a/client/driver/syslog_plugin.go +++ b/client/driver/syslog_plugin.go @@ -5,7 +5,7 @@ import ( "net/rpc" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/logcollector" + "github.com/hashicorp/nomad/client/driver/logging" "github.com/hashicorp/nomad/nomad/structs" ) @@ -14,11 +14,11 @@ type SyslogCollectorRPC struct { } type LaunchCollectorArgs struct { - Ctx *logcollector.LogCollectorContext + Ctx *logging.LogCollectorContext } -func (e *SyslogCollectorRPC) LaunchCollector(ctx *logcollector.LogCollectorContext) (*logcollector.SyslogCollectorState, error) { - var ss *logcollector.SyslogCollectorState +func (e *SyslogCollectorRPC) LaunchCollector(ctx *logging.LogCollectorContext) (*logging.SyslogCollectorState, error) { + var ss *logging.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 logcollector.LogCollector + Impl logging.LogCollector } func (s *SyslogCollectorRPCServer) LaunchCollector(args LaunchCollectorArgs, - resp *logcollector.SyslogCollectorState) error { + resp *logging.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: logcollector.NewSyslogCollector(p.logger)} + p.Impl = &SyslogCollectorRPCServer{Impl: logging.NewSyslogCollector(p.logger)} } return p.Impl, nil } diff --git a/client/driver/utils.go b/client/driver/utils.go index bfb923e1b..abaec9469 100644 --- a/client/driver/utils.go +++ b/client/driver/utils.go @@ -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/logcollector" + "github.com/hashicorp/nomad/client/driver/logging" ) // 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) (logcollector.LogCollector, *plugin.Client, error) { + clientConfig *config.Config) (logging.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.(logcollector.LogCollector) + logCollector := raw.(logging.LogCollector) return logCollector, syslogClient, nil }