Author: dmeyer
Date: Tue Oct 31 17:01:17 2006
New Revision: 1945
Added:
trunk/beacon/src/server/__init__.py
trunk/beacon/src/server/hwmon/
- copied from r1944, /trunk/beacon/src/hwmon/
Removed:
trunk/beacon/src/hwmon/
Modified:
trunk/beacon/bin/beacon
trunk/beacon/src/server/server.py
Log:
move some files around (part 2)
Modified: trunk/beacon/bin/beacon
==============================================================================
--- trunk/beacon/bin/beacon (original)
+++ trunk/beacon/bin/beacon Tue Oct 31 17:01:17 2006
@@ -284,8 +284,8 @@
pid = os.fork()
if not pid:
# hwmon part (import this first because of hal/gtk)
- import kaa.beacon.hwmon.server
- kaa.beacon.hwmon.server.Server()
+ import kaa.beacon.server.hwmon.server
+ kaa.beacon.server.hwmon.server.Server()
# thumbnailer part
import kaa.beacon.thumbnail.server
@@ -305,9 +305,9 @@
# beacon server
-import kaa.beacon.server
+import kaa.beacon.server.server
import kaa.beacon.thumbnail
-import kaa.beacon.hwmon
+import kaa.beacon.server.hwmon
def garbage_collect():
g = gc.collect()
@@ -328,10 +328,10 @@
# connect hwmon
log.info('connect to hwmon ...')
- kaa.beacon.hwmon.connect()
+ kaa.beacon.server.hwmon.connect()
log.info('connection to hwmon established')
- server = kaa.beacon.server.Server(database)
+ server = kaa.beacon.server.server.Server(database)
if os.environ.get('BEACON_MONITOR'):
for dirname in os.environ.get('BEACON_MONITOR').split(':'):
log.info('monitor %s', dirname)
Added: trunk/beacon/src/server/__init__.py
==============================================================================
Modified: trunk/beacon/src/server/server.py
==============================================================================
--- trunk/beacon/src/server/server.py (original)
+++ trunk/beacon/src/server/server.py Tue Oct 31 17:01:17 2006
@@ -43,11 +43,11 @@
# kaa.beacon imports
from kaa.beacon.db import *
-import kaa.beacon.hwmon
from kaa.beacon.media import medialist
# kaa.beacon server imports
import parser
+import hwmon
from monitor import Monitor
from crawl import Crawler
@@ -158,7 +158,7 @@
'volume.mount_point': '/'
}
- kaa.beacon.hwmon.set_database(self, self._db, rootfs)
+ hwmon.set_database(self, self._db, rootfs)
self._db.commit()
for dir in config.monitors:
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
