Skip to content

Commit

Permalink
feature: Add a new locking framework that uses flock. (librenms#6858)
Browse files Browse the repository at this point in the history
Change locks to use flock, as pid checking is not
sufficient when PID Namespaces are involved.
  • Loading branch information
keeperofdakeys authored and murrant committed Jul 3, 2017
1 parent f02b551 commit 701fbbc
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 4 deletions.
95 changes: 95 additions & 0 deletions LibreNMS/FileLock.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?php

/**
* LibreNMS
*
* This file is part of LibreNMS.
*
* @package LibreNMS
* @subpackage FileLock
* @copyright (C) 2017
*
*/

namespace LibreNMS;

class FileLock
{
private $name = "";
private $file = "";
/**
* @var resource | false
*/
private $handle = false;
private $acquired = false;

private function __construct($lock_name)
{
global $config;

$this->name = $lock_name;
$this->file = "$config[install_dir]/.$lock_name.lock";
$this->handle = fopen($this->file, "w+");
}

public function __destruct()
{
$this->release();
}

/**
* Release the lock.
*/
public function release()
{
if (!$this->acquired) {
return;
}

if ($this->handle !== false) {
flock($this->handle, LOCK_UN);
fclose($this->handle);
}
if (file_exists($this->file)) {
unlink($this->file);
}
}

/**
* Given a lock name, try to acquire the lock.
* On success return a FileLock object, or on failure return false.
* @param string $lock_name Name of lock
* @return mixed
*/
public static function lock($lock_name)
{
$lock = new self($lock_name);
if ($lock->handle === false) {
return false;
}

if (flock($lock->handle, LOCK_EX | LOCK_NB)) {
$lock->acquired = true;
return $lock;
} else {
return false;
}
}

/**
* Given a lock name, try to acquire the lock, exiting on failure.
* On success return a FileLock object.
* @param string $lock_name Name of lock
* @return FileLock
*/
public static function lockOrDie($lock_name)
{
$lock = self::lock($lock_name);

if ($lock === false) {
echo "Failed to acquire lock $lock_name, exiting\n";
exit(1);
}
return $lock;
}
}
4 changes: 2 additions & 2 deletions alerts.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

$options = getopt('d::');

set_lock('alerts');
$alerts_lock = \LibreNMS\FileLock::lockOrDie('alerts');

if (isset($options['d'])) {
echo "DEBUG!\n";
Expand Down Expand Up @@ -60,4 +60,4 @@
echo 'End : '.date('r')."\r\n";
}

release_lock('alerts');
$alerts_lock->release();
7 changes: 5 additions & 2 deletions discovery.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
$where = ' ';
$doing = 'all';
} elseif ($options['h'] == 'new') {
set_lock('new-discovery');
$new_discovery_lock = \LibreNMS\FileLock::lockOrDie('new-discovery');
$where = 'AND `last_discovered` IS NULL';
$doing = 'new';
} elseif ($options['h']) {
Expand Down Expand Up @@ -140,10 +140,13 @@
if ($doing === 'new') {
// We have added a new device by this point so we might want to do some other work
oxidized_reload_nodes();
release_lock('new-discovery');
}
}

if ($doing === 'new') {
$new_discovery_lock->release();
}

$string = $argv[0]." $doing ".date($config['dateformat']['compact'])." - $discovered_devices devices discovered in $proctime secs";
d_echo("$string\n");

Expand Down

0 comments on commit 701fbbc

Please sign in to comment.