Commit 9882a69e authored by Yoshinori Okuji's avatar Yoshinori Okuji

Move the database manager to storage/, because it is used only by storage node.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@46 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 370c9a9d
...@@ -10,7 +10,7 @@ from neo.protocol import Packet, ProtocolError, \ ...@@ -10,7 +10,7 @@ from neo.protocol import Packet, ProtocolError, \
INVALID_UUID, INVALID_OID, INVALID_TID, INVALID_PTID INVALID_UUID, INVALID_OID, INVALID_TID, INVALID_PTID
from neo.node import NodeManager, MasterNode, StorageNode, ClientNode from neo.node import NodeManager, MasterNode, StorageNode, ClientNode
from neo.event import EventManager from neo.event import EventManager
from neo.database import DatabaseManager from neo.storage.mysqldb import MySQLDatabaseManager
from neo.util import dump from neo.util import dump
from neo.connection import ListeningConnection, ClientConnection, ServerConnection from neo.connection import ListeningConnection, ClientConnection, ServerConnection
from neo.exception import OperationFailure, PrimaryFailure from neo.exception import OperationFailure, PrimaryFailure
...@@ -39,8 +39,8 @@ class Application(object): ...@@ -39,8 +39,8 @@ class Application(object):
# Internal attributes. # Internal attributes.
self.em = EventManager() self.em = EventManager()
self.nm = NodeManager() self.nm = NodeManager()
self.dm = DatabaseManager(config.getDatabase(), config.getUser(), self.dm = MySQLDatabaseManager(config.getDatabase(), config.getUser(),
config.getPassword()) config.getPassword())
self.pt = PartitionTable(self.num_partitions, 0) self.pt = PartitionTable(self.num_partitions, 0)
self.primary_master_node = None self.primary_master_node = None
......
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