Commit a93ea5f1 authored by Julien Muchembled's avatar Julien Muchembled

CMFActivity: fix direct import of getServerAddress for TIDStorage product

This is a mirror of the late import of getCurrentNode within
product/ERP5Type/Core/Folder.py
Both are required depending on which module is imported first.
parent 2260fc70
Pipeline #6633 failed with stage
in 0 seconds
...@@ -34,7 +34,6 @@ from types import StringType ...@@ -34,7 +34,6 @@ from types import StringType
from collections import defaultdict from collections import defaultdict
from cPickle import dumps, loads from cPickle import dumps, loads
from Products.CMFCore import permissions as CMFCorePermissions from Products.CMFCore import permissions as CMFCorePermissions
from Products.ERP5Type.Tool.BaseTool import BaseTool
from Products.CMFActivity.ActiveResult import ActiveResult from Products.CMFActivity.ActiveResult import ActiveResult
from Products.CMFActivity.ActiveObject import DEFAULT_ACTIVITY from Products.CMFActivity.ActiveObject import DEFAULT_ACTIVITY
from Products.CMFActivity.ActivityConnection import ActivityConnection from Products.CMFActivity.ActivityConnection import ActivityConnection
...@@ -87,11 +86,6 @@ _server_address = None ...@@ -87,11 +86,6 @@ _server_address = None
ROLE_IDLE = 0 ROLE_IDLE = 0
ROLE_PROCESSING = 1 ROLE_PROCESSING = 1
# Activating a path means we tried to avoid loading useless
# data in cache so there would be no gain to expect.
# And all nodes are likely to have tools already loaded.
NO_DEFAULT_NODE_PREFERENCE = str, BaseTool
# Logging channel definitions # Logging channel definitions
import logging import logging
# Main logging channel # Main logging channel
...@@ -609,6 +603,12 @@ def cancelProcessShutdown(): ...@@ -609,6 +603,12 @@ def cancelProcessShutdown():
is_running_lock.release() is_running_lock.release()
has_processed_shutdown = False has_processed_shutdown = False
from Products.ERP5Type.Tool.BaseTool import BaseTool
Please register or sign in to reply
# Activating a path means we tried to avoid loading useless
# data in cache so there would be no gain to expect.
# And all nodes are likely to have tools already loaded.
NO_DEFAULT_NODE_PREFERENCE = str, BaseTool
class ActivityTool (BaseTool): class ActivityTool (BaseTool):
""" """
ActivityTool is the central point for activity management. ActivityTool is the central point for activity management.
......
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 to comment