diff options
| author | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-05-21 01:35:52 +0200 |
|---|---|---|
| committer | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-05-21 02:57:11 +0200 |
| commit | 3a2acefebd5c1626df997f676ed3b61deb8c6c36 (patch) | |
| tree | ced7ed1cf42cd5031ebad819026ddc24a72006bf /src/streamtest.cc | |
| parent | ceph_crypto: add assert_init (diff) | |
| download | ceph-3a2acefebd5c1626df997f676ed3b61deb8c6c36.tar.xz ceph-3a2acefebd5c1626df997f676ed3b61deb8c6c36.zip | |
common_init: don't init crypto until after fork
Get rid of the initialize-then-shutdown-crypto hack. We just initialize
crypto once, after it is safe to do so. There is now a single callback,
common_init_finish, which does the final stage of initialization,
including starting crypto and daemonization (if required.)
common_init_finish needs to be done before messenger::start().
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Diffstat (limited to 'src/streamtest.cc')
| -rw-r--r-- | src/streamtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/streamtest.cc b/src/streamtest.cc index 3ffe1da4e2b..08c8ab957ae 100644 --- a/src/streamtest.cc +++ b/src/streamtest.cc @@ -97,7 +97,7 @@ int main(int argc, const char **argv) env_to_vec(args); common_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); - keyring_init(&g_conf); + common_init_finish(&g_conf, 0); // args if (args.size() < 3) return -1; |