This doesn't really take much advantage of structured logging beyond what is already done (`id` and `idColor`), and consequently the log handler does not try to do any handling of anything more than that (i.e., grouping, or arbitrary attributes beyond those defined).
One should maybe have a `Context` available to pass in, but there isn't one, and anyway, the log handler doesn't use it, so I've passed in a `TODO` instead.
Everything else is just normal import/rename changes.
Testing Done:
Ran `go run . run`
Reviewed at https://reviews.imfreedom.org/r/2871/
// Convey
// Copyright 2016-2018 Gary Kramlich <grim@reaperworld.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
packageexec
import(
"slices"
"sync"
)
const(
minAlloc=10
)
// Generator represents a command generator.
typeGeneratorstruct{
args[]string
locksync.Mutex
}
// NewGenerator creates a new generator initialized with the gives arguments.
funcNewGenerator(args...string)*Generator{
g:=&Generator{
args:make([]string,0,minAlloc),
}
g.Appendv(args)
returng
}
// Append appends the given arguments to the end of the arguments.
func(g*Generator)Append(args...string){
g.Appendv(args)
}
// Appendv appends the give string slice to the command
func(g*Generator)Appendv(args[]string){
g.lock.Lock()
deferg.lock.Unlock()
iflen(args)<=0{
return
}
g.args=slices.Insert(g.args,len(g.args),args...)
}
// Prepend prepends the given arguments to the beginning of the arguments.
func(g*Generator)Prepend(args...string){
g.Prependv(args)
}
// Prependv prepends the given string slice to the command.