Author: dmeyer
Date: Tue Oct 31 17:22:46 2006
New Revision: 1947
Added:
trunk/beacon/src/libthumb.c
- copied unchanged from r1946, /trunk/beacon/src/thumbnail.c
Removed:
trunk/beacon/src/thumbnail.c
trunk/beacon/src/thumbnail.h
Modified:
trunk/beacon/bin/beacon
trunk/beacon/setup.py
trunk/beacon/src/server/__init__.py
trunk/beacon/src/server/thumbnailer.py
Log:
move some files around (part 4)
Modified: trunk/beacon/bin/beacon
==============================================================================
--- trunk/beacon/bin/beacon (original)
+++ trunk/beacon/bin/beacon Tue Oct 31 17:22:46 2006
@@ -279,17 +279,18 @@
'%(filename)s %(lineno)s: %(message)s')
handler.setFormatter(f)
log.addHandler(handler)
-
+
+
+import kaa.beacon.server
+
# fork thumbnailer / hwmon
pid = os.fork()
if not pid:
# hwmon part (import this first because of hal/gtk)
- import kaa.beacon.server.hwmon.server
- kaa.beacon.server.hwmon.server.Server()
+ hwmon = kaa.beacon.server.HardwareMonitorServer()
# thumbnailer part
- import kaa.beacon.server.thumbnailer
- kaa.beacon.server.thumbnailer.init()
+ thumb = kaa.beacon.server.Thumbnailer()
# set nice level
os.nice(19)
@@ -305,9 +306,7 @@
# beacon server
-import kaa.beacon.server.server
import kaa.beacon.thumbnail
-import kaa.beacon.server.hwmon
def garbage_collect():
g = gc.collect()
@@ -328,10 +327,10 @@
# connect hwmon
log.info('connect to hwmon ...')
- kaa.beacon.server.hwmon.connect()
+ kaa.beacon.server.HardwareMonitorClient().connect()
log.info('connection to hwmon established')
- server = kaa.beacon.server.server.Server(database)
+ server = kaa.beacon.server.BeaconServer(database)
if os.environ.get('BEACON_MONITOR'):
for dirname in os.environ.get('BEACON_MONITOR').split(':'):
log.info('monitor %s', dirname)
Modified: trunk/beacon/setup.py
==============================================================================
--- trunk/beacon/setup.py (original)
+++ trunk/beacon/setup.py Tue Oct 31 17:22:46 2006
@@ -41,7 +41,7 @@
sys.exit(1)
thumb_ext = Extension("kaa.beacon._libthumb",
- ["src/thumbnail.c", "src/libpng.c" ],
+ ["src/libthumb.c", "src/libpng.c" ],
config='src/config.h')
if not thumb_ext.check_library('imlib2', '1.1.1'):
Modified: trunk/beacon/src/server/__init__.py
==============================================================================
--- trunk/beacon/src/server/__init__.py (original)
+++ trunk/beacon/src/server/__init__.py Tue Oct 31 17:22:46 2006
@@ -0,0 +1,18 @@
+def BeaconServer(database):
+ import server
+ return server.Server(database)
+
+def HardwareMonitorServer():
+ import hwmon.server
+ return hwmon.server.Server()
+
+def HardwareMonitorClient():
+ import hwmon
+ return hwmon
+
+def Thumbnailer():
+ import thumbnailer
+ return thumbnailer.init()
+
+def connect_hardware_monitor():
+ import hwmon.server
Modified: trunk/beacon/src/server/thumbnailer.py
==============================================================================
--- trunk/beacon/src/server/thumbnailer.py (original)
+++ trunk/beacon/src/server/thumbnailer.py Tue Oct 31 17:22:46 2006
@@ -249,3 +249,5 @@
log.error('thumbnail: %s' % e)
time.sleep(0.1)
sys.exit(0)
+
+ return thumbnailer
-------------------------------------------------------------------------
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
