Move constructors closer to type definition

Christian Muirhead · Christian Muirhead · commit bed4b3426d3b · 2016-11-23T15:10:24.000+13:00
diff --git a/apiserver/logsink.go b/apiserver/logsink.go
@@ -54,6 +54,10 @@ type agentLoggingStrategy struct {
 	fileLogger io.Writer
 }
 
+func newAgentLoggingStrategy(ctxt httpContext, fileLogger io.Writer) LoggingStrategy {
+	return &agentLoggingStrategy{ctxt: ctxt, fileLogger: fileLogger}
+}
+
 // Authenticate checks that this is request is from a machine
 // agent. Part of LoggingStrategy.
 func (s *agentLoggingStrategy) Authenticate(req *http.Request) error {
@@ -111,10 +115,6 @@ func (s *agentLoggingStrategy) Stop() {
 	s.ctxt.release(s.st)
 }
 
-func newAgentLoggingStrategy(ctxt httpContext, fileLogger io.Writer) LoggingStrategy {
-	return &agentLoggingStrategy{ctxt: ctxt, fileLogger: fileLogger}
-}
-
 func newLogSinkHandler(h httpContext, w io.Writer, newStrategy func(httpContext, io.Writer) LoggingStrategy) http.Handler {
 	return &logSinkHandler{ctxt: h, fileLogger: w, newStrategy: newStrategy}
 }
diff --git a/apiserver/logtransfer.go b/apiserver/logtransfer.go
@@ -24,6 +24,10 @@ type migrationLoggingStrategy struct {
 	fileLogger io.Writer
 }
 
+func newMigrationLoggingStrategy(ctxt httpContext, fileLogger io.Writer) LoggingStrategy {
+	return &migrationLoggingStrategy{ctxt: ctxt, fileLogger: fileLogger}
+}
+
 // Authenticate checks that the user is a controller superuser and
 // that the requested model is migrating. Part of LoggingStrategy.
 func (s *migrationLoggingStrategy) Authenticate(req *http.Request) error {
@@ -71,7 +75,3 @@ func (s *migrationLoggingStrategy) Stop() {
 	s.dbLogger.Close()
 	s.ctxt.release(s.st)
 }
-
-func newMigrationLoggingStrategy(ctxt httpContext, fileLogger io.Writer) LoggingStrategy {
-	return &migrationLoggingStrategy{ctxt: ctxt, fileLogger: fileLogger}
-}

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ type agentLoggingStrategy struct {`
`54`	`54`	`fileLogger io.Writer`
`55`	`55`	`}`
`56`	`56`
	`57`	`+func newAgentLoggingStrategy(ctxt httpContext, fileLogger io.Writer) LoggingStrategy {`
	`58`	`+ return &agentLoggingStrategy{ctxt: ctxt, fileLogger: fileLogger}`
	`59`	`+}`
	`60`	`+`
`57`	`61`	`// Authenticate checks that this is request is from a machine`
`58`	`62`	`// agent. Part of LoggingStrategy.`
`59`	`63`	`func (s agentLoggingStrategy) Authenticate(req http.Request) error {`
`@@ -111,10 +115,6 @@ func (s *agentLoggingStrategy) Stop() {`
`111`	`115`	`s.ctxt.release(s.st)`
`112`	`116`	`}`
`113`	`117`
`114`		`-func newAgentLoggingStrategy(ctxt httpContext, fileLogger io.Writer) LoggingStrategy {`
`115`		`- return &agentLoggingStrategy{ctxt: ctxt, fileLogger: fileLogger}`
`116`		`-}`
`117`		`-`
`118`	`118`	`func newLogSinkHandler(h httpContext, w io.Writer, newStrategy func(httpContext, io.Writer) LoggingStrategy) http.Handler {`
`119`	`119`	`return &logSinkHandler{ctxt: h, fileLogger: w, newStrategy: newStrategy}`
`120`	`120`	`}`