From 31df5e0e85d26c008f7781ec94e1c5c9e8c7238d Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 25 Sep 2018 10:11:54 -0400 Subject: Ensure different error messages and creating/opening locks Signed-off-by: Matthew Heon --- libpod/runtime.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libpod/runtime.go') diff --git a/libpod/runtime.go b/libpod/runtime.go index a39547a43..ae4b77bd4 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -541,11 +541,14 @@ func makeRuntime(runtime *Runtime) (err error) { } if doRefresh { manager, err = lock.NewSHMLockManager(lockPath, runtime.config.NumLocks) + if err != nil { + return errors.Wrapf(err, "error creating SHM locks for libpod") + } } else { manager, err = lock.OpenSHMLockManager(lockPath, runtime.config.NumLocks) - } - if err != nil { - return errors.Wrapf(err, "error initializing SHM locking") + if err != nil { + return errors.Wrapf(err, "error opening libpod SHM locks") + } } runtime.lockManager = manager @@ -720,7 +723,6 @@ func makeRuntime(runtime *Runtime) (err error) { if err2 := runtime.refresh(runtimeAliveFile); err2 != nil { return err2 } - } } -- cgit v1.2.3-54-g00ecf