svn commit: r1212419 - /karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java

[gn...@apache.org]

Author: gnodet
Date: Fri Dec  9 13:47:18 2011
New Revision: 1212419

URL: http://svn.apache.org/viewvc?rev=1212419&view=rev
Log:
Slightly improve logging for the initial file locking

Modified:
    karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java

Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java?rev=1212419&r1=1212418&r2=1212419&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/lock/SimpleFileLock.java Fri Dec  9 13:47:18 2011
@@ -33,6 +33,7 @@ public class SimpleFileLock implements L
     private static final String PROPERTY_LOCK_DIR = "karaf.lock.dir";
     private static final String PROP_KARAF_BASE = "karaf.base";
     private RandomAccessFile lockFile;
+    private File lockPath;
     private FileLock lock;
 
     public SimpleFileLock(Properties props) {
@@ -49,23 +50,29 @@ public class SimpleFileLock implements L
             }
 
             File base = new File(props.getProperty(PROPERTY_LOCK_DIR));
-            lockFile = new RandomAccessFile(new File(base, "lock"), "rw");
+            lockPath = new File(base, "lock"); 
+            lockFile = new RandomAccessFile(lockPath, "rw");
         } catch (IOException e) {
             throw new RuntimeException("Could not create file lock", e);
         }
     }
 
     public boolean lock() throws Exception {
-        LOG.info("locking");
+        LOG.info("Trying to lock " + lockPath.getPath());
         if (lock == null) {
             lock = lockFile.getChannel().tryLock();
         }
+        if (lock != null) {
+            LOG.info("Lock acquired");
+        } else {
+            LOG.info("Lock failed");
+        }
         return lock != null;
     }
 
     public void release() throws Exception {
-        LOG.info("releasing");
         if (lock != null && lock.isValid()) {
+            LOG.info("Releasing lock " + lockPath.getPath());
             lock.release();
             lock.channel().close();
         }