account and container log differently than object servers

[John Dickinson]

In the object server, we log "content-length, referrer, txid, user-agent", and in the container server we log "content-length, txid, referrer, user-agent".

This discrepancy needs to be fixed.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/83237

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/83237
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=d32dc8d49c19de8b1264cae23b82b3ffd9707454
Submitter: Jenkins
Branch: master

commit d32dc8d49c19de8b1264cae23b82b3ffd9707454
Author: Greg Lange <email address hidden>
Date: Wed Mar 26 22:55:55 2014 +0000

    Unify backend logging

    Make account, object, and container servers construct log lines using the
    same utility function so they will produce identically formatted lines.

    This change reorders the fields logged for the account server.

    This change also adds the "additional info" field to the two servers that
    didn't log that field. This makes the log lines identical across all 3
    servers. If people don't like that, I can take that out. I think it makes
    the documentation, parsing of the log lines, and the code a tad cleaner.

    DocImpact

    Change-Id: I268dc0df9dd07afa5382592a28ea37b96c6c2f44
    Closes-Bug: 1280955

[Openstack Gerrit (openstack-gerrit)]

Fix proposed to branch: feature/ec
Review: https://review.openstack.org/88359

[Openstack Gerrit (openstack-gerrit)]

Reviewed: https://review.openstack.org/88359
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=282548d538153fa2fae1d2a4ec19d75dc2a41028
Submitter: Jenkins
Branch: feature/ec

commit 856c15539a958dabe3b8a1f22d305048ca39de9a
Author: Paul Luse <email address hidden>
Date: Mon Apr 14 15:19:22 2014 -0700

    Fix testcase test_print_db_info_metadata()

    Test compares cluster info to hardcoded expected data and wasn't
    sorting the two sets of things being compared leading to some
    sporadic unit test failures.

    Change-Id: I3ef98260a62c15d06ba8cc196196d4e90abca3f0

commit 67fff5b2973f5ca12316041664eddf3e8ece45be
Author: Madhuri Kumari <email address hidden>
Date: Fri Apr 11 11:53:48 2014 +0530

    Print 'Container Count' in data base info

    Currently, 'Container Count' was missing in data base info.
    So this patch will help printing 'Container Count' also.

    Change-Id: I1ca80ee79e71b086b30fd2d1ab024ea1cfb324f5

commit deb0dfd090cee2feef664bdd4449194c274d830e
Author: Peter Portante <email address hidden>
Date: Thu Apr 10 14:36:43 2014 -0400

    Add includes of referenced SAIO bin scripts

    Change-Id: I6810e69a757336a3aed0a38146c27f270fe2dde1

commit 2c2ede22338d6ca9637233076157f1d26248fbf1
Author: Chuck Thier <email address hidden>
Date: Thu Apr 10 18:59:01 2014 +0000

    Fix logging issue when services stop on py26

    On older versions of python 2.6, exceptions would be spewed to the error
    log whenever a service would stop. This gets magnified by the
    container-updater which seems to do it with every pass. This catches
    and squelches the error.

    Change-Id: I128c09c240e768e8195af1f6fe79b10d4e432471
    Closes-Bug: #1306027

commit 5ff6a4d5d6cdbf39ba9f6d5d416cdd1c6c6a52ac
Author: Peter Portante <email address hidden>
Date: Mon Apr 7 13:01:44 2014 -0400

    Use eventlet instead of threading for timeout

    The only explicit use of Python threading is found in the
    testFileSizeLimit test. Using eventlet seems a bit easier to follow,
    accomplishing the same goal, and does not constrain us to a
    multi-threaded environment.

    The chunks() and timeout() module level functions are only used by one
    test each, so we just move them to those tests to indicate they are not
    used globally.

    Change-Id: I50b9fb798fbfd1d552b3c3f90309f6b86da34853

commit 58fe2f256fccc14f5078e9fde9b9f7b2219a06e5
Author: anc <email address hidden>
Date: Tue Apr 8 18:44:06 2014 +0100

    Add tests and comments re constraints in /info

    Add test to check that only the expected keys are
    reported by proxy in /info, and add comments to
    raise awareness that default constraints will be
    automatically published by proxy in response to /info
    requests.

    Change-Id: Ia5f6339b06cdc2e1dc960d1f75562a2505530202

commit c2744caac43586b745c43c37a9c31483f7a126fc
Author: Samuel Merritt <email address hidden>
Date: Tue Apr 8 11:44:58 2014 -0700

    Fix deprecation warning

    Accessing BaseException.message spews a warning; we can get the same
    information with str(err), which does not spew.

    Change-Id: I67...