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.

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

formatter: improve pretty output, rename factory method #3366

Merged
merged 3 commits into from Jan 14, 2015
Merged

Conversation

liewegas
Copy link
Member

Go from this:

root@mira040:~# ceph osd find 0
{ "osd": 0,
  "ip": "10.214.133.134:6810\/1679",
  "crush_location": { "host": "mira040",
      "root": "default"}}root@mira040:~# 

to this:

maetl:src (wip-formatter) 08:10 AM $ ./ceph osd find 0
{
    "osd": 0,
    "ip": "127.0.0.1:6806\/7906",
    "crush_location": {
        "host": "maetl",
        "root": "default"
    }
}
maetl:src (wip-formatter) 08:57 AM $ 

Sage Weil and others added 3 commits January 13, 2015 08:06
This applies to json-pretty and xml-pretty modes.

Signed-off-by: Sage Weil <sage@inktank.com>
The whitespace for the current pretty mode is awkward and weird.  Move
to a more standard approach.  It's more newlines, but *much* more
readable.

Signed-off-by: Sage Weil <sage@redhat.com>
Also make the default formatter selection more explicit.

Signed-off-by: Sage Weil <sage@redhat.com>
@loic-bot
Copy link

FAIL: the output of run-make-check.sh on centos-centos7 for 35eb1b4 is http://paste2.org/MCFdJMfU

:octocat: Sent from GH.

@loic-bot
Copy link

FAIL: the output of run-make-check.sh on centos-centos7 for a3507ea is http://paste2.org/W7jC4Akn

:octocat: Sent from GH.

@ghost
Copy link

ghost commented Jan 14, 2015

both make check run timeout

@dmick
Copy link
Member

dmick commented Jan 14, 2015

Thanks for investigating the failures @dachary

@dmick
Copy link
Member

dmick commented Jan 14, 2015

While I certainly don't really understand the formatting changes to json-pretty (comments? are you mad?), the overall changes look good to me.

dmick added a commit that referenced this pull request Jan 14, 2015
formatter: improve pretty output, rename factory method

Reviewed-by: Dan Mick <dan.mick@redhat.com>
@dmick dmick merged commit 9542416 into master Jan 14, 2015
@yuyuyu101
Copy link
Member

@dachary it looks this series affect master branch UT robot.

@ghost
Copy link

ghost commented Jan 15, 2015

@yuyuyu101 yes, master is now broken http://tracker.ceph.com/issues/10547

@liewegas liewegas deleted the wip-formatter branch November 23, 2016 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants