Skip to content

/moby

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.

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

Add system time to /info #11291

Merged
merged 1 commit into from Mar 11, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@ahmetb @jessfraz @icecrime @SvenDowideit @moxiegirl @tiborvass @GordonTheTurtle
@ahmetb
Copy link
Contributor

commented Mar 10, 2015

This change adds daemon's system time as RFC3339Nano to the /info endpoint
and shows in a more readable format (UnixDate) in docker -D info output.

I will be using this to fix the clock skew between the remote test host and
the CI machines running docker events-related tests as they're using --since
and --until and the timestamps are not matching when daemon is not on the
same machine.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @icecrime @duglin @jfrazelle

@GordonTheTurtle GordonTheTurtle added the status/0-triage label Mar 10, 2015

@tiborvass tiborvass added status/2-code-review and removed status/0-triage labels Mar 10, 2015

@ahmetb

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Mar 10, 2015

@jfrazelle we'll need to refresh all the remote test daemon binaries once this is merged to fix the events-related tests on windows CI 😭 😭 just giving a heads up.
@jessfraz

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Mar 10, 2015

cool cool

On Tue, Mar 10, 2015 at 2:34 PM, Ahmet Alp Balkan notifications@github.com
wrote:

@jfrazelle https://github.com/jfrazelle we'll need to refresh all the
remote test daemons once this is merged to fix the events-related tests on
windows CI [image: 😭] [image: 😭] just giving a heads up.

—
Reply to this email directly or view it on GitHub
#11291 (comment).
@jessfraz

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Mar 10, 2015

LGTM
engine/env.go Outdated
@@ -69,6 +70,15 @@ func (env *Env) SetBool(key string, value bool) {
}
}

func (env *Env) GetDate(key string) (time.Time, error) {

This comment has been minimized.

Sign in to view
Copy link
@tiborvass

tiborvass Mar 10, 2015

Collaborator

should be GetTime and SetTime

This comment has been minimized.

Sign in to view
Copy link
@ahmetb

ahmetb Mar 10, 2015

Author Contributor

@tiborvass right. fixed.
@ahmetb
Add system time to /info 
This change adds daemon's system time as RFC3339Nano to the `/info` endpoint
and shows in a more readable format (UnixDate) in `docker -D info` output.

I will be using this to fix the clock skew between the remote test host and
the CI machines running `docker events`-related tests as they're using `--since`
and `--until` and the timestamps are not matching when daemon is not on the
same machine.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Loading status checks…
2977fd2
@ahmetb

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Mar 11, 2015

Anyone else? 👀
engine/env.go
@@ -69,6 +70,15 @@ func (env *Env) SetBool(key string, value bool) {
}
}

func (env *Env) GetTime(key string) (time.Time, error) {
t, err := time.Parse(time.RFC3339Nano, env.Get(key))
return t, err

This comment has been minimized.

Sign in to view
Copy link
@icecrime

icecrime Mar 11, 2015

Contributor

Not a blocker, but why not directly return time.Parse(...)?

This comment has been minimized.

Sign in to view
Copy link
@ahmetb

ahmetb Mar 11, 2015

Author Contributor

erm, right. should I fix? @icecrime

This comment has been minimized.

Sign in to view
Copy link
@icecrime

icecrime Mar 11, 2015

Contributor

We'll survive :p
@icecrime

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Mar 11, 2015

Yup, LGTM!

Moving to 3-docs-review: some of the samples might need updating.

@icecrime icecrime added status/3-docs-review and removed status/2-code-review labels Mar 11, 2015

@ahmetb

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Mar 11, 2015

@icecrime updated Remote API 1.18 already.
@SvenDowideit

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Mar 11, 2015

examples in the Docs LGTM - @docker/docs-owners
@moxiegirl

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Mar 11, 2015

LGTM

moxiegirl added a commit that referenced this pull request Mar 11, 2015

@moxiegirl
Merge pull request #11291 from ahmetalpbalkan/info/system-date 
Add system time to /info
d010bf0

@moxiegirl moxiegirl merged commit d010bf0 into moby:master Mar 11, 2015
1 check passed

1 check passed

janky Jenkins build Docker-PRs 3014 has succeeded
Details

@moxiegirl moxiegirl removed the status/3-docs-review label Mar 11, 2015

@ahmetb

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Mar 11, 2015

Thanks for reviewing. @jfrazelle we need to update remote test daemon bits with this now. 😎
@jessfraz

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Mar 11, 2015

woohooo

@ahmetb ahmetb deleted the ahmetb:info/system-date branch Mar 11, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.