funcaspect branch for func integration

[plcapi.git] / aspects / __init__.py

diff --git a/aspects/__init__.py b/aspects/__init__.py
index bcce3bc..a140869 100644 (file)
--- a/aspects/__init__.py
+++ b/aspects/__init__.py
@@ -1,16 +1,20 @@
-
-
 from pyaspects.weaver import weave_class_method
 
 from PLC.Method import Method
 from aspects.omfaspects import OMFAspect
+from aspects.ratelimitaspects import RateLimitAspect
+#disabled for now - caglar
+#from aspects.funcaspects import FuncAspect
 
-
-def apply_aspects():
-
-    # TEST
-    #from pyaspects.debuggeraspect import DebuggerAspect
-    #weave_class_method(DebuggerAspect(out=open("/tmp/all_method_calls.log", "a")), Method, "__call__")
-
+def apply_omf_aspect():
     # track all PLC methods to add OMF hooks
     weave_class_method(OMFAspect(), Method, "__call__")
+    weave_class_method(RateLimitAspect(), Method, "__call__")
+#disabled for now - caglar
+#    weave_class_method(FuncAspect(), Method, "__call__")
+
+def apply_debugger_aspect():
+    # just log all method calls w/ their parameters
+    from pyaspects.debuggeraspect import DebuggerAspect
+    weave_class_method(DebuggerAspect(out=open("/tmp/all_method_calls.log", "a")), Method, "__call__")
+