Commit 647166f2 by user

fixing decorator to use decorator module properly

parent ef7ca318
......@@ -3,7 +3,7 @@
import libvirt
import logging
import os
import decorator
from decorator import decorator
connection = None
......@@ -18,18 +18,17 @@ state_dict = {0: 'NOSTATE',
}
@decorator.decorator
def req_connection(original_function):
@decorator
def req_connection(original_function, *args, **kw):
'''Connection checking decorator for libvirt.
'''
def new_function(*args, **kwargs):
logging.debug("Decorator running")
global connection
if connection is None:
connect()
try:
logging.debug("Decorator calling original function")
return_value = original_function(*args, **kwargs)
return_value = original_function(*args, **kw)
finally:
logging.debug("Finally part of decorator")
disconnect()
......@@ -37,9 +36,8 @@ def req_connection(original_function):
else:
logging.debug("Decorator calling original \
function with active connection")
return_value = original_function(*args, **kwargs)
return_value = original_function(*args, **kw)
return return_value
return new_function
def connect(connection_string='qemu:///system'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment