diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-07 10:00:37 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-14 14:56:28 -0500 |
| commit | ff0048a3a26c9076c8052a8c7be171e4364f0d09 (patch) | |
| tree | 71d260915f46d65ae2794ab22dbe32181bd5d05f /src/lib/Bcfg2/Server/Plugins/Metadata.py | |
| parent | 9d0e6991fc23c073efc0db6bf10e1081f6725e55 (diff) | |
| download | bcfg2-ff0048a3a26c9076c8052a8c7be171e4364f0d09.tar.gz bcfg2-ff0048a3a26c9076c8052a8c7be171e4364f0d09.tar.bz2 bcfg2-ff0048a3a26c9076c8052a8c7be171e4364f0d09.zip | |
moved common file locking code into Bcfg2.Utils
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Metadata.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index ef0c152fd..df98e6ea8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -15,6 +15,7 @@ import Bcfg2.Server import Bcfg2.Server.Lint import Bcfg2.Server.Plugin import Bcfg2.Server.FileMonitor +from Bcfg2.Utils import locked from Bcfg2.Compat import MutableMapping, all, wraps # pylint: disable=W0622 from Bcfg2.version import Bcfg2VersionInfo @@ -27,15 +28,6 @@ except ImportError: LOGGER = logging.getLogger(__name__) -def locked(fd): - """ Acquire a lock on a file """ - try: - fcntl.lockf(fd, fcntl.LOCK_EX | fcntl.LOCK_NB) - except IOError: - return True - return False - - if HAS_DJANGO: class MetadataClientModel(models.Model, Bcfg2.Server.Plugin.PluginDatabaseModel): @@ -195,7 +187,7 @@ class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked): newcontents = lxml.etree.tostring(dataroot, xml_declaration=False, pretty_print=True).decode('UTF-8') - while locked(fd) == True: + while locked(fd): pass try: datafile.write(newcontents) |