Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from glog to klog #130

Merged
merged 2 commits into from
Jul 16, 2019
Merged

Migrate from glog to klog #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9ffee1
Migrage glog to klog
adambkaplan Jul 12, 2019
9ab8823
vndr bump
adambkaplan Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cmd/imagebuilder/imagebuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@ import (

dockertypes "github.com/docker/docker/api/types"
docker "github.com/fsouza/go-dockerclient"
"github.com/golang/glog"
"k8s.io/klog"

"github.com/openshift/imagebuilder"
"github.com/openshift/imagebuilder/dockerclient"
)

func init() {
klog.InitFlags(flag.CommandLine)
}

func main() {
log.SetFlags(0)
options := dockerclient.NewClientExecutor(nil)
Expand Down Expand Up @@ -87,7 +91,7 @@ func main() {
return nil, false
}
options.LogFn = func(format string, args ...interface{}) {
if glog.V(2) {
if klog.V(2) {
log.Printf("Builder: "+format, args...)
} else {
fmt.Fprintf(options.Out, "--> %s\n", fmt.Sprintf(format, args...))
Expand Down
16 changes: 8 additions & 8 deletions dockerclient/archive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/containers/storage/pkg/archive"
"github.com/containers/storage/pkg/fileutils"
"github.com/containers/storage/pkg/idtools"
"github.com/golang/glog"
"k8s.io/klog"
)

// TransformFileFunc is given a chance to transform an arbitrary input file.
Expand All @@ -40,7 +40,7 @@ func FilterArchive(r io.Reader, w io.Writer, fn TransformFileFunc) error {
var body io.Reader = tr
name := h.Name
data, ok, skip, err := fn(h, tr)
glog.V(6).Infof("Transform %s -> %s: data=%t ok=%t skip=%t err=%v", name, h.Name, data != nil, ok, skip, err)
klog.V(6).Infof("Transform %s -> %s: data=%t ok=%t skip=%t err=%v", name, h.Name, data != nil, ok, skip, err)
if err != nil {
return err
}
Expand Down Expand Up @@ -169,7 +169,7 @@ func archiveFromDisk(directory string, src, dst string, allowDownload bool, excl

// special case when we are archiving a single file at the root
if len(infos) == 1 && !infos[0].FileInfo.IsDir() && (infos[0].Path == "." || infos[0].Path == "/") {
glog.V(5).Infof("Archiving a file instead of a directory from %s", directory)
klog.V(5).Infof("Archiving a file instead of a directory from %s", directory)
infos[0].Path = filepath.Base(directory)
infos[0].FromDir = false
directory = filepath.Dir(directory)
Expand All @@ -180,7 +180,7 @@ func archiveFromDisk(directory string, src, dst string, allowDownload bool, excl
return nil, nil, err
}

glog.V(4).Infof("Tar of %s %#v", directory, options)
klog.V(4).Infof("Tar of %s %#v", directory, options)
rc, err := archive.TarWithOptions(directory, options)
return rc, rc, err
}
Expand Down Expand Up @@ -248,7 +248,7 @@ func archivePathMapper(src, dst string, isDestDir bool) (fn func(name string, is
}
pattern := filepath.Base(srcPattern)

glog.V(6).Infof("creating mapper for srcPattern=%s pattern=%s dst=%s isDestDir=%t", srcPattern, pattern, dst, isDestDir)
klog.V(6).Infof("creating mapper for srcPattern=%s pattern=%s dst=%s isDestDir=%t", srcPattern, pattern, dst, isDestDir)

// no wildcards
if !containsWildcards(pattern) {
Expand Down Expand Up @@ -437,7 +437,7 @@ func archiveOptionsFor(infos []CopyInfo, dst string, excludes []string, check Di
options.RebaseNames = make(map[string]string)
}

glog.V(6).Infof("len=%d info.FromDir=%t info.IsDir=%t dstIsRoot=%t dstIsDir=%t srcIsDir=%t", len(infos), info.FromDir, info.IsDir(), dstIsRoot, dstIsDir, srcIsDir)
klog.V(6).Infof("len=%d info.FromDir=%t info.IsDir=%t dstIsRoot=%t dstIsDir=%t srcIsDir=%t", len(infos), info.FromDir, info.IsDir(), dstIsRoot, dstIsDir, srcIsDir)
switch {
case len(infos) > 1 && dstIsRoot:
// copying multiple things into root, no rename necessary ([Dockerfile, dir] -> [Dockerfile, dir])
Expand Down Expand Up @@ -485,14 +485,14 @@ func logArchiveOutput(r io.Reader, prefix string) {
if err != nil {
return err
}
glog.Infof("%s %s (%d %s)", prefix, h.Name, h.Size, h.FileInfo().Mode())
klog.Infof("%s %s (%d %s)", prefix, h.Name, h.Size, h.FileInfo().Mode())
if _, err := io.Copy(ioutil.Discard, tr); err != nil {
return err
}
}
}()
if err != io.EOF {
glog.Infof("%s: unable to log archive output: %v", prefix, err)
klog.Infof("%s: unable to log archive output: %v", prefix, err)
io.Copy(ioutil.Discard, pr)
}
}()
Expand Down
66 changes: 33 additions & 33 deletions dockerclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
"strings"

dockertypes "github.com/docker/docker/api/types"
"github.com/openshift/imagebuilder/dockerfile/parser"
docker "github.com/fsouza/go-dockerclient"
"github.com/golang/glog"
"k8s.io/klog"

"github.com/openshift/imagebuilder"
"github.com/openshift/imagebuilder/dockerfile/parser"
"github.com/openshift/imagebuilder/imageprogress"
)

Expand Down Expand Up @@ -192,7 +192,7 @@ func (e *ClientExecutor) Stages(b *imagebuilder.Builder, stages imagebuilder.Sta
Config: b.Builder.Config(),
}
stageExecutor.Container = prereq.Container
glog.V(4).Infof("Using previous stage %s as image: %#v", from, stageExecutor.Image.Config)
klog.V(4).Infof("Using previous stage %s as image: %#v", from, stageExecutor.Image.Config)
}
stageFrom = from
}
Expand Down Expand Up @@ -251,7 +251,7 @@ func (e *ClientExecutor) Prepare(b *imagebuilder.Builder, node *parser.Node, fro
}
e.Deferred = append(e.Deferred, func() error { return e.Client.RemoveImage(from) })
}
glog.V(4).Infof("Retrieving image %q", from)
klog.V(4).Infof("Retrieving image %q", from)
e.Image, err = e.LoadImage(from)
if err != nil {
return err
Expand All @@ -270,7 +270,7 @@ func (e *ClientExecutor) Prepare(b *imagebuilder.Builder, node *parser.Node, fro
} else {
e.LogFn("FROM %s", from)
}
glog.V(4).Infof("step: FROM %s as %s", from, e.Name)
klog.V(4).Infof("step: FROM %s as %s", from, e.Name)

b.Excludes = e.Excludes

Expand Down Expand Up @@ -338,7 +338,7 @@ func (e *ClientExecutor) Prepare(b *imagebuilder.Builder, node *parser.Node, fro
opts.HostConfig.Binds = append(originalBinds, binds...)
}

glog.V(4).Infof("Creating container with %#v %#v", opts.Config, opts.HostConfig)
klog.V(4).Infof("Creating container with %#v %#v", opts.Config, opts.HostConfig)
container, err := e.Client.CreateContainer(opts)
if err != nil {
return fmt.Errorf("unable to create build container: %v", err)
Expand Down Expand Up @@ -366,7 +366,7 @@ func (e *ClientExecutor) Execute(b *imagebuilder.Builder, node *parser.Node) err
if err := step.Resolve(child); err != nil {
return err
}
glog.V(4).Infof("step: %s", step.Original)
klog.V(4).Infof("step: %s", step.Original)
if e.LogFn != nil {
// original may have unescaped %, so perform fmt escaping
e.LogFn(strings.Replace(step.Original, "%", "%%", -1))
Expand All @@ -387,7 +387,7 @@ func (e *ClientExecutor) Commit(b *imagebuilder.Builder) error {
config := b.Config()

if e.Container.State.Running {
glog.V(4).Infof("Stopping container %s ...", e.Container.ID)
klog.V(4).Infof("Stopping container %s ...", e.Container.ID)
if err := e.Client.StopContainer(e.Container.ID, 0); err != nil {
return fmt.Errorf("unable to stop build container: %v", err)
}
Expand All @@ -400,12 +400,12 @@ func (e *ClientExecutor) Commit(b *imagebuilder.Builder) error {
var repository, tag string
if len(e.Tag) > 0 {
repository, tag = docker.ParseRepositoryTag(e.Tag)
glog.V(4).Infof("Committing built container %s as image %q: %#v", e.Container.ID, e.Tag, config)
klog.V(4).Infof("Committing built container %s as image %q: %#v", e.Container.ID, e.Tag, config)
if e.LogFn != nil {
e.LogFn("Committing changes to %s ...", e.Tag)
}
} else {
glog.V(4).Infof("Committing built container %s: %#v", e.Container.ID, config)
klog.V(4).Infof("Committing built container %s: %#v", e.Container.ID, config)
if e.LogFn != nil {
e.LogFn("Committing changes ...")
}
Expand All @@ -429,7 +429,7 @@ func (e *ClientExecutor) Commit(b *imagebuilder.Builder) error {
}

e.Image = image
glog.V(4).Infof("Committed %s to %s", e.Container.ID, image.ID)
klog.V(4).Infof("Committed %s to %s", e.Container.ID, image.ID)

if len(e.Tag) > 0 {
for _, s := range e.AdditionalTags {
Expand Down Expand Up @@ -557,7 +557,7 @@ func (e *ClientExecutor) LoadImage(from string) (*docker.Image, error) {
}

if !e.AllowPull {
glog.V(4).Infof("image %s did not exist", from)
klog.V(4).Infof("image %s did not exist", from)
return nil, docker.ErrNoSuchImage
}

Expand All @@ -566,7 +566,7 @@ func (e *ClientExecutor) LoadImage(from string) (*docker.Image, error) {
tag = "latest"
}

glog.V(4).Infof("attempting to pull %s with auth from repository %s:%s", from, repository, tag)
klog.V(4).Infof("attempting to pull %s with auth from repository %s:%s", from, repository, tag)

// TODO: we may want to abstract looping over multiple credentials
auth, _ := e.AuthFn(repository)
Expand Down Expand Up @@ -600,7 +600,7 @@ func (e *ClientExecutor) LoadImage(from string) (*docker.Image, error) {
OutputStream: pullWriter,
RawJSONStream: true,
}
if glog.V(5) {
if klog.V(5) {
pullImageOptions.OutputStream = os.Stderr
pullImageOptions.RawJSONStream = false
}
Expand Down Expand Up @@ -655,7 +655,7 @@ func (e *ClientExecutor) EnsureContainerPath(path string) error {
Mode: 0755,
})
}()
glog.V(4).Infof("Uploading empty archive to %q", dest)
klog.V(4).Infof("Uploading empty archive to %q", dest)
err := e.Client.UploadToContainer(e.Container.ID, opts)
if err != nil {
return fmt.Errorf("unable to ensure existence of preserved path %s: %v", dest, err)
Expand Down Expand Up @@ -751,7 +751,7 @@ func (e *ClientExecutor) Run(run imagebuilder.Run, config docker.Config) error {
}

config.Cmd = args
glog.V(4).Infof("Running %#v inside of %s as user %s", config.Cmd, e.Container.ID, config.User)
klog.V(4).Infof("Running %#v inside of %s as user %s", config.Cmd, e.Container.ID, config.User)
exec, err := e.Client.CreateExec(docker.CreateExecOptions{
Cmd: config.Cmd,
Container: e.Container.ID,
Expand All @@ -773,7 +773,7 @@ func (e *ClientExecutor) Run(run imagebuilder.Run, config docker.Config) error {
return err
}
if status.ExitCode != 0 {
glog.V(4).Infof("Failed command (code %d): %v", status.ExitCode, args)
klog.V(4).Infof("Failed command (code %d): %v", status.ExitCode, args)
return fmt.Errorf("running '%s' failed with exit code %d", strings.Join(run.Args, " "), status.ExitCode)
}

Expand All @@ -799,7 +799,7 @@ func (e *ClientExecutor) CopyContainer(container *docker.Container, excludes []s
for _, c := range copies {
// TODO: reuse source
for _, src := range c.Src {
glog.V(4).Infof("Archiving %s download=%t fromFS=%t from=%s", src, c.Download, c.FromFS, c.From)
klog.V(4).Infof("Archiving %s download=%t fromFS=%t from=%s", src, c.Download, c.FromFS, c.From)
var r io.Reader
var closer io.Closer
var err error
Expand All @@ -812,16 +812,16 @@ func (e *ClientExecutor) CopyContainer(container *docker.Container, excludes []s
return err
}

glog.V(5).Infof("Uploading to %s at %s", container.ID, c.Dest)
if glog.V(6) {
klog.V(5).Infof("Uploading to %s at %s", container.ID, c.Dest)
if klog.V(6) {
logArchiveOutput(r, "Archive file for %s")
}
err = e.Client.UploadToContainer(container.ID, docker.UploadToContainerOptions{
InputStream: r,
Path: "/",
})
if err := closer.Close(); err != nil {
glog.Errorf("Error while closing stream container copy stream %s: %v", container.ID, err)
klog.Errorf("Error while closing stream container copy stream %s: %v", container.ID, err)
}
if err != nil {
return err
Expand Down Expand Up @@ -850,11 +850,11 @@ func (e *ClientExecutor) archiveFromContainer(from string, src, dst string) (io.
if other.Container == nil {
return nil, nil, fmt.Errorf("the stage %q has not been built yet", from)
}
glog.V(5).Infof("Using container %s as input for archive request", other.Container.ID)
klog.V(5).Infof("Using container %s as input for archive request", other.Container.ID)
containerID = other.Container.ID
containerConfig = other.Container.Config
} else {
glog.V(5).Infof("Creating a container temporarily for image input from %q in %s", from, src)
klog.V(5).Infof("Creating a container temporarily for image input from %q in %s", from, src)
_, err := e.LoadImage(from)
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -884,7 +884,7 @@ func (e *ClientExecutor) archiveFromContainer(from string, src, dst string) (io.
return nil, nil, err
}
go func() {
glog.V(6).Infof("Download from container %s at path %s", containerID, archiveRoot)
klog.V(6).Infof("Download from container %s at path %s", containerID, archiveRoot)
err := e.Client.DownloadFromContainer(containerID, docker.DownloadFromContainerOptions{
OutputStream: pw,
Path: archiveRoot,
Expand All @@ -904,21 +904,21 @@ func (e *ClientExecutor) Archive(fromFS bool, src, dst string, allowDownload boo
if !allowDownload {
return nil, nil, fmt.Errorf("source can't be a URL")
}
glog.V(5).Infof("Archiving %s -> %s from URL", src, dst)
klog.V(5).Infof("Archiving %s -> %s from URL", src, dst)
return archiveFromURL(src, dst, e.TempDir, check)
}
// the input is from the filesystem, use the source as the input
if fromFS {
glog.V(5).Infof("Archiving %s %s -> %s from a filesystem location", src, ".", dst)
klog.V(5).Infof("Archiving %s %s -> %s from a filesystem location", src, ".", dst)
return archiveFromDisk(src, ".", dst, allowDownload, excludes, check)
}
// if the context is in archive form, read from it without decompressing
if len(e.ContextArchive) > 0 {
glog.V(5).Infof("Archiving %s %s -> %s from context archive", e.ContextArchive, src, dst)
klog.V(5).Infof("Archiving %s %s -> %s from context archive", e.ContextArchive, src, dst)
return archiveFromFile(e.ContextArchive, src, dst, excludes, check)
}
// if the context is a directory, we only allow relative includes
glog.V(5).Infof("Archiving %q %q -> %q from disk", e.Directory, src, dst)
klog.V(5).Infof("Archiving %q %q -> %q from disk", e.Directory, src, dst)
return archiveFromDisk(e.Directory, src, dst, allowDownload, excludes, check)
}

Expand Down Expand Up @@ -966,7 +966,7 @@ func (t *ContainerVolumeTracker) ReleasePath(path string) {
if err != nil && !os.IsNotExist(err) {
t.errs = append(t.errs, err)
}
glog.V(5).Infof("Releasing path %s (%v)", path, err)
klog.V(5).Infof("Releasing path %s (%v)", path, err)
t.paths[path] = ""
}
}
Expand Down Expand Up @@ -1044,7 +1044,7 @@ func snapshotPath(path, containerID, tempDir string, client *docker.Client) (str
if err != nil {
return "", err
}
glog.V(4).Infof("Snapshot %s for later use under %s", path, f.Name())
klog.V(4).Infof("Snapshot %s for later use under %s", path, f.Name())

r, w := io.Pipe()
tr := tar.NewReader(r)
Expand All @@ -1059,10 +1059,10 @@ func snapshotPath(path, containerID, tempDir string, client *docker.Client) (str
if err == nil || err == io.EOF {
tw.Flush()
w.Close()
glog.V(5).Infof("Snapshot rewritten from %s", path)
klog.V(5).Infof("Snapshot rewritten from %s", path)
return
}
glog.V(5).Infof("Snapshot of %s failed: %v", path, err)
klog.V(5).Infof("Snapshot of %s failed: %v", path, err)
w.CloseWithError(err)
}()

Expand Down Expand Up @@ -1092,7 +1092,7 @@ func (t *ContainerVolumeTracker) Restore(containerID string, client *docker.Clie
if len(archivePath) == 0 {
return fmt.Errorf("path %s does not have an archive and cannot be restored", dest)
}
glog.V(4).Infof("Restoring contents of %s from %s", dest, archivePath)
klog.V(4).Infof("Restoring contents of %s from %s", dest, archivePath)
if !strings.HasSuffix(dest, "/") {
dest = dest + "/"
}
Expand Down
Loading