[Box Backup-commit] [boxbackup/boxbackup] 258d6e: Move functions around to reduce diffs to s3_suppor...

GitHub noreply at github.com
Fri Nov 10 22:21:35 GMT 2017


  Branch: refs/heads/s3_support_merge
  Home:   https://github.com/boxbackup/boxbackup
  Commit: 258d6e289c7b98ce353b0583a6542ea2c736e74c
      https://github.com/boxbackup/boxbackup/commit/258d6e289c7b98ce353b0583a6542ea2c736e74c
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/backupstore/BackupAccountControl.cpp

  Log Message:
  -----------
  Move functions around to reduce diffs to s3_support


  Commit: 5bab96579f675f5b49443999f3bb824d1a617ef6
      https://github.com/boxbackup/boxbackup/commit/5bab96579f675f5b49443999f3bb824d1a617ef6
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/backupstore/BackupAccountControl.cpp
    M lib/backupstore/BackupAccountControl.h
    M lib/win32/getopt_long.cpp

  Log Message:
  -----------
  Fix compile error in BSD getopt_long.cpp

error: '&&' within '||' [-Werror,-Wlogical-op-parentheses]


  Commit: 233929611e001b23877aca830067193ab3953e49
      https://github.com/boxbackup/boxbackup/commit/233929611e001b23877aca830067193ab3953e49
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/httpserver/SimpleDBClient.h

  Log Message:
  -----------
  Fix SimpleDB timeouts: should be in milliseconds, not seconds

(cherry picked from commit 24bc49f30b9ce54d5024777f9c34d70a476d9663)


  Commit: 4ff8928bab44d6a61f3f337d44c26c2658814485
      https://github.com/boxbackup/boxbackup/commit/4ff8928bab44d6a61f3f337d44c26c2658814485
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/server/ServerStream.h
    M test/backupstore/testbackupstore.cpp

  Log Message:
  -----------
  ServerStream and test/backupstore: improve comments slightly

(cherry picked from commit c50aac67ee6ce6af9d63d5b96290585f2c5b7c21)


  Commit: f68f029a41ec08a330a481e235f30b69c28a935f
      https://github.com/boxbackup/boxbackup/commit/f68f029a41ec08a330a481e235f30b69c28a935f
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/httpserver/S3Simulator.cpp

  Log Message:
  -----------
  S3Simulator: add some TRACE logging to help debug 100-continue responses

(cherry picked from commit ca39b88d4a73b64de68400dfa29270f203fd0f14)


  Commit: c5a0d1e6f0fa6f4f32cef9a6a50cb897e975e307
      https://github.com/boxbackup/boxbackup/commit/c5a0d1e6f0fa6f4f32cef9a6a50cb897e975e307
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/httpserver/S3Client.h

  Log Message:
  -----------
  Increase timeouts in S3Client to help with debugging

(cherry picked from commit cc14b3b4b9ec509233000c7d0a995580afd97f15)


  Commit: c875c38dfc808f6f47d4d196d17b3a2eaa6dd51d
      https://github.com/boxbackup/boxbackup/commit/c875c38dfc808f6f47d4d196d17b3a2eaa6dd51d
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/server/SocketStream.cpp

  Log Message:
  -----------
  SocketStream: use THROW_SOCKET_ERROR for better messages on Windows

(cherry picked from commit feddbef8052208508a2e542a1a70c23138f476b8)


  Commit: 875ce5b9e56a3f8fc5f18b2329643d77b06aec97
      https://github.com/boxbackup/boxbackup/commit/875ce5b9e56a3f8fc5f18b2329643d77b06aec97
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/common/Logging.cpp
    M lib/common/Logging.h

  Log Message:
  -----------
  Enable overriding log level by category as well as filename

This extends the -L command-line option to allow overriding by
filename/category=level as well as the existing support for overriding by
filename=level.

(cherry picked from commit 4421c53ab59adb494308f9c9f881a6a57bfd571c)


  Commit: ca83b8cfa67729ad465d22c0d357a4c08c53210a
      https://github.com/boxbackup/boxbackup/commit/ca83b8cfa67729ad465d22c0d357a4c08c53210a
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/win32/emu.cpp

  Log Message:
  -----------
  Windows syslog() emulation: improve error messages

If syslog can't log to the Windows event log for some reason, instead of
just printing the log message to the console, include some explanatory
text about what went wrong.

(cherry picked from commit c492c90062d2e88db1016f13bd912629477a8a46)


  Commit: 44c96dd2368a5a69a4b8b87daf5b9252a552062f
      https://github.com/boxbackup/boxbackup/commit/44c96dd2368a5a69a4b8b87daf5b9252a552062f
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/server/ServerStream.h

  Log Message:
  -----------
  Improve exception handling in single-process servers

Don't allow an uncaught exception to kill the whole server. This makes it
consistent with multi-process servers, where death of a child worker does
not stop the main server process, so it continues to serve requests.

This makes the HTTPServer robust to exceptions (such as the child
disconnecting while the server is streaming a response) on Windows.

(cherry picked from commit 4a515b9ce8e616b357dc07bee27aa7b3692c3602)


  Commit: 5ce5cb5da3bf8e2e5d597e87b8f0332c6a010d75
      https://github.com/boxbackup/boxbackup/commit/5ce5cb5da3bf8e2e5d597e87b8f0332c6a010d75
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/backupstore/BackupFileSystem.cpp

  Log Message:
  -----------
  Fix rare crash while tearing down S3BackupFileSystem

ReleaseLock() could fail if it can't contact the S3/SimpleDB server, but
destructors aren't allowed to throw exceptions, so catch this case and log
a warning instead (because we failed to release the lock that we were
holding).

(cherry picked from commit 6226c014dd2988a6a29cd21f6cc29fa0e7816607)


Compare: https://github.com/boxbackup/boxbackup/compare/fb3fa2a39981...5ce5cb5da3bf


More information about the Boxbackup-commit mailing list