Attachment #112305 for bug #153698

View | Details | Raw Unified | Return to bug 153698
Collapse All | Expand All

Lines 6-12 Link Here

(-)cherokee-new/Makefile (-3 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 1.0.10	9	PORTVERSION= 1.0.15
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \	11	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \
12	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \	12	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
Lines 182-187 Link Here
182	$$i > $${i%.pre};done	182	$$i > $${i%.pre};done
183		183
184	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	184	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
		185	${WRKSRC}/admin/CTK/CTK-run.pre
		186	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
		187	${WRKSRC}/cherokee/cherokee-admin-launcher
		188	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
185	${WRKSRC}/admin/server.py	189	${WRKSRC}/admin/server.py
186	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	190	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
187	${WRKSRC}/admin/upgrade_config.py	191	${WRKSRC}/admin/upgrade_config.py
Lines 198-205 Link Here
198	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	202	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
199	${WRKSRC}/po/po_stats.py	203	${WRKSRC}/po/po_stats.py
200	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	204	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
201	${WRKSRC}/packages/osx/build.py
202	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
203	${WRKSRC}/qa/fcgi.py	205	${WRKSRC}/qa/fcgi.py
204	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	206	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
205	${WRKSRC}/qa/run-tests.py	207	${WRKSRC}/qa/run-tests.py

Lines 1-2 Link Here

(-)cherokee-new/distinfo (-2 / +2 lines)
1	SHA256 (cherokee-1.0.10.tar.gz) = 688b8112506c2692cd0547dc9f4dc0837aa1a4b38d077ec3dacef3acacbe474d	1	SHA256 (cherokee-1.0.15.tar.gz) = 014ff6ddf5491c2289cab135c28a8c69955ef2c0cd8a60531cd6bc4f4918c3eb
2	SIZE (cherokee-1.0.10.tar.gz) = 5689814	2	SIZE (cherokee-1.0.15.tar.gz) = 5827351




--- admin/SystemStats.py-orig	2010-11-18 07:53:18.000000000 -0300
+++ admin/SystemStats.py	2010-11-25 20:38:23.000000000 -0300
@@ -23,6 +23,7 @@
 #
 
 import os
+import popen
 import re
 import sys
 import time
@@ -42,6 +43,8 @@
             _stats = System_stats__Linux()
         elif sys.platform == 'darwin':
             _stats = System_stats__Darwin()
+        elif sys.platform.startswith ('freebsd'):
+            _stats = System_stats__FreeBSD()
 
     assert _stats, "Not implemented"
     return _stats
@@ -286,6 +289,130 @@
             time.sleep (self.CHECK_INTERVAL)
 
 
+
+# FreeBSD implementation
+class System_stats__FreeBSD (Thread, System_stats):
+    CHECK_INTERVAL = 2
+
+    def __init__ (self):
+        Thread.__init__ (self)
+        System_stats.__init__ (self)
+        
+        self.vmstat_fd = subprocess.Popen ("/usr/bin/vmstat -H -w%d" %(self.CHECK_INTERVAL),
+                                            shell=True, stdout = subprocess.PIPE, close_fds=True )
+
+	#first,second = self.vmstat_fd.stdout.readline(),self.vmstat_fd.stdout.readline()
+
+
+        # Read valid values
+        self._read_hostname()
+        self._read_cpu()
+        self._read_memory()
+        self._read_cpu_and_mem_info()
+
+        self.start()
+
+    def _read_hostname (self):
+        # First try: uname()
+	self.hostname = os.uname()[1]
+        if self.hostname:
+            return
+
+        # Second try: sysctl()
+        ret = popen.popen_sync ("/sbin/sysctl -n kern.hostname")
+        self.hostname = ret['stdout'].rstrip()
+        if self.hostname:
+            return
+
+        # Could not figure it out
+        self.hostname = "Unknown"
+
+    def _read_cpu_and_mem_info (self):
+        # Execute sysctl
+        ret = popen.popen_sync ("/sbin/sysctl hw.ncpu hw.clockrate kern.threads.virtual_cpu hw.pagesize vm.stats.vm.v_page_count")
+        lines = filter (lambda x: x, ret['stdout'].split('\n'))
+
+        # Parse output
+	
+	# cpu related
+        ncpus = 0
+        vcpus = 0
+	clock = ''
+
+        # mem related
+	psize  = 0
+	pcount = 0
+
+	for line in lines:
+	    parts = line.split()
+	    if parts[0] == 'hw.ncpu:':
+		ncpus = int(parts[1])
+            elif parts[0] == 'hw.clockrate:':
+		clock = parts[1]
+            elif parts[0] == 'kern.threads.virtual_cpu:':
+		vcpus = parts[1]
+            elif parts[0] == 'vm.stats.vm.v_page_count:':
+		pcount = int(parts[1])
+            elif parts[0] == 'hw.pagesize:':
+		psize = int(parts[1])
+
+	# Deal with cores
+        if vcpus:
+            self.cpu.num   = str (int(vcpus) / int(ncpus))
+            self.cpu.cores = vcpus
+        else:
+            self.cpu.num   = int (ncpus)
+            self.cpu.cores = int (ncpus)
+
+        # Global speed
+	self.cpu.speed = '%s MHz' %(clock)
+
+
+	# Physical mem
+	self.mem.total = (psize * pcount) / 1024 
+
+    def _read_cpu (self):
+
+	# Read a new line
+        line = self.vmstat_fd.stdout.readline().rstrip('\n')
+
+        # Skip headers
+	if len(filter (lambda x: x not in " .0123456789", line)):
+	    return
+        
+        # Parse
+	parts = filter (lambda x: x, line.split(' '))
+
+	if not len(parts) == 18:
+		return
+
+	self.cpu.idle  = int(parts[17])
+	self.cpu.usage = 100 - self.cpu.idle
+
+    def _read_memory (self):
+
+        line = self.vmstat_fd.stdout.readline().rstrip('\n')
+
+        # Skip headers
+        if len(filter (lambda x: x not in " .0123456789", line)):
+            return
+
+        # Parse
+        values = filter (lambda x: x, line.split(' '))
+
+	if not len(values)==18:
+		return 
+
+        self.mem.free  = int(values[4]) 
+        self.mem.used  = self.mem.total - self.mem.free
+
+    def run (self):
+        while True:
+            self._read_cpu()
+            self._read_memory()
+            time.sleep (self.CHECK_INTERVAL)
+
+
 if __name__ == '__main__':
     sys_stats = get_system_stats()
 

Lines 3-8 Link Here

(-)cherokee-new/pkg-plist (+25 lines)
3	bin/cherokee-config	3	bin/cherokee-config
4	bin/cherokee-panic	4	bin/cherokee-panic
5	bin/cherokee-tweak	5	bin/cherokee-tweak
		6	bin/cherokee-macos-askpass
		7	bin/cherokee-admin-launcher
6	@unexec for i in `find %D/etc/cherokee -name \*.default`;do if cmp -s $i ${i%%.default};then rm -f ${i%%.default};fi;done	8	@unexec for i in `find %D/etc/cherokee -name \*.default`;do if cmp -s $i ${i%%.default};then rm -f ${i%%.default};fi;done
7	@unexec for i in `find %D/etc/cherokee -name \*.sample`;do if cmp -s $i ${i%%.sample};then rm -f ${i%%.sample};fi;done	9	@unexec for i in `find %D/etc/cherokee -name \*.sample`;do if cmp -s $i ${i%%.sample};then rm -f ${i%%.sample};fi;done
8	etc/cherokee/cherokee.conf.default	10	etc/cherokee/cherokee.conf.default
Lines 89-94 Link Here
89	lib/cherokee/libplugin_exists.so	91	lib/cherokee/libplugin_exists.so
90	lib/cherokee/libplugin_extensions.la	92	lib/cherokee/libplugin_extensions.la
91	lib/cherokee/libplugin_extensions.so	93	lib/cherokee/libplugin_extensions.so
		94	lib/cherokee/libplugin_failover.la
		95	lib/cherokee/libplugin_failover.so
92	lib/cherokee/libplugin_fcgi.la	96	lib/cherokee/libplugin_fcgi.la
93	lib/cherokee/libplugin_fcgi.so	97	lib/cherokee/libplugin_fcgi.so
94	lib/cherokee/libplugin_file.la	98	lib/cherokee/libplugin_file.la
Lines 175-180 Link Here
175	lib/libcherokee-server.so	179	lib/libcherokee-server.so
176	lib/libcherokee-server.so.0	180	lib/libcherokee-server.so.0
177	libdata/pkgconfig/cherokee.pc	181	libdata/pkgconfig/cherokee.pc
		182	man/man1/cherokee-admin-launcher.1
178	sbin/cherokee	183	sbin/cherokee
179	sbin/cherokee-admin	184	sbin/cherokee-admin
180	sbin/cherokee-worker	185	sbin/cherokee-worker
Lines 389-394 Link Here
389	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/ui-icons_cd0a0a_256x240.png	394	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/ui-icons_cd0a0a_256x240.png
390	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/uploadify.cancel.png	395	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/uploadify.cancel.png
391	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/ajaxupload.3.6.js	396	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/ajaxupload.3.6.js
		397	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Carousel.js
392	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Help.js	398	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Help.js
393	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Submitter.js	399	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Submitter.js
394	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/common.js	400	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/common.js
Lines 447-452 Link Here
447	%%ADMIN%%%%DATADIR%%/admin/Rule.pyc	453	%%ADMIN%%%%DATADIR%%/admin/Rule.pyc
448	%%ADMIN%%%%DATADIR%%/admin/RuleSimple.py	454	%%ADMIN%%%%DATADIR%%/admin/RuleSimple.py
449	%%ADMIN%%%%DATADIR%%/admin/RuleSimple.pyc	455	%%ADMIN%%%%DATADIR%%/admin/RuleSimple.pyc
		456	%%ADMIN%%%%DATADIR%%/admin/SavingChecks.py
		457	%%ADMIN%%%%DATADIR%%/admin/SavingChecks.pyc
450	%%ADMIN%%%%DATADIR%%/admin/SelectionPanel.py	458	%%ADMIN%%%%DATADIR%%/admin/SelectionPanel.py
451	%%ADMIN%%%%DATADIR%%/admin/SelectionPanel.pyc	459	%%ADMIN%%%%DATADIR%%/admin/SelectionPanel.pyc
452	%%ADMIN%%%%DATADIR%%/admin/Wizard.py	460	%%ADMIN%%%%DATADIR%%/admin/Wizard.py
Lines 461-466 Link Here
461	%%ADMIN%%%%DATADIR%%/admin/consts.pyc	469	%%ADMIN%%%%DATADIR%%/admin/consts.pyc
462	%%ADMIN%%%%DATADIR%%/admin/exception.html	470	%%ADMIN%%%%DATADIR%%/admin/exception.html
463	%%ADMIN%%%%DATADIR%%/admin/help.html	471	%%ADMIN%%%%DATADIR%%/admin/help.html
		472	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-16.png
		473	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-32.png
		474	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-48.png
		475	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-96.png
		476	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-128.png
		477	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-256.png
		478	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-512.png
		479	%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher.svg
464	%%ADMIN%%%%DATADIR%%/admin/plugins/admin.py	480	%%ADMIN%%%%DATADIR%%/admin/plugins/admin.py
465	%%ADMIN%%%%DATADIR%%/admin/plugins/admin.pyc	481	%%ADMIN%%%%DATADIR%%/admin/plugins/admin.pyc
466	%%ADMIN%%%%DATADIR%%/admin/plugins/authlist.py	482	%%ADMIN%%%%DATADIR%%/admin/plugins/authlist.py
Lines 555-560 Link Here
555	%%ADMIN%%%%DATADIR%%/admin/plugins/uwsgi.pyc	571	%%ADMIN%%%%DATADIR%%/admin/plugins/uwsgi.pyc
556	%%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.py	572	%%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.py
557	%%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.pyc	573	%%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.pyc
		574	%%ADMIN%%%%DATADIR%%/admin/plugins/failover.py
		575	%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.py
		576	%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.py
		577	%%ADMIN%%%%DATADIR%%/admin/plugins/failover.pyc
		578	%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.pyc
		579	%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.pyc
558	%%ADMIN%%%%DATADIR%%/admin/server.py	580	%%ADMIN%%%%DATADIR%%/admin/server.py
559	%%ADMIN%%%%DATADIR%%/admin/server.pyc	581	%%ADMIN%%%%DATADIR%%/admin/server.pyc
560	%%ADMIN%%%%DATADIR%%/admin/static/css/cherokee-admin.css	582	%%ADMIN%%%%DATADIR%%/admin/static/css/cherokee-admin.css
Lines 925-930 Link Here
925	%%ADMIN%%%%DATADIR%%/admin/wizards/moinmoin.pyc	947	%%ADMIN%%%%DATADIR%%/admin/wizards/moinmoin.pyc
926	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.py	948	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.py
927	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.pyc	949	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.pyc
		950	%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.py
		951	%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.pyc
928	%%ADMIN%%%%DATADIR%%/admin/wizards/php.py	952	%%ADMIN%%%%DATADIR%%/admin/wizards/php.py
929	%%ADMIN%%%%DATADIR%%/admin/wizards/php.pyc	953	%%ADMIN%%%%DATADIR%%/admin/wizards/php.pyc
930	%%ADMIN%%%%DATADIR%%/admin/wizards/phpbb.py	954	%%ADMIN%%%%DATADIR%%/admin/wizards/phpbb.py
Lines 1035-1040 Link Here
1035	%%ADMIN%%@dirrm %%DATADIR%%/admin/static	1059	%%ADMIN%%@dirrm %%DATADIR%%/admin/static
1036	%%ADMIN%%@dirrm %%DATADIR%%/admin/plugins	1060	%%ADMIN%%@dirrm %%DATADIR%%/admin/plugins
1037	%%ADMIN%%@dirrm %%DATADIR%%/admin/market	1061	%%ADMIN%%@dirrm %%DATADIR%%/admin/market
		1062	%%ADMIN%%@dirrm %%DATADIR%%/admin/icons
1038	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/js	1063	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/js
1039	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/images	1064	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/images
1040	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/css	1065	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/css

Return to bug 153698

Lines 1-150 Link Here

(-)cherokee-new/files/patch-cherokee-admin-systemstats.py (-150 lines)
1	--- admin/SystemStats.py-orig 2010-11-18 07:53:18.000000000 -0300
2	+++ admin/SystemStats.py 2010-11-25 20:38:23.000000000 -0300
3	@@ -23,6 +23,7 @@
4	#
5
6	import os
7	+import popen
8	import re
9	import sys
10	import time
11	@@ -42,6 +43,8 @@
12	_stats = System_stats__Linux()
13	elif sys.platform == 'darwin':
14	_stats = System_stats__Darwin()
15	+ elif sys.platform.startswith ('freebsd'):
16	+ _stats = System_stats__FreeBSD()
17
18	assert _stats, "Not implemented"
19	return _stats
20	@@ -286,6 +289,130 @@
21	time.sleep (self.CHECK_INTERVAL)
22
23
24	+
25	+# FreeBSD implementation
26	+class System_stats__FreeBSD (Thread, System_stats):
27	+ CHECK_INTERVAL = 2
28	+
29	+ def __init__ (self):
30	+ Thread.__init__ (self)
31	+ System_stats.__init__ (self)
32	+
33	+ self.vmstat_fd = subprocess.Popen ("/usr/bin/vmstat -H -w%d" %(self.CHECK_INTERVAL),
34	+ shell=True, stdout = subprocess.PIPE, close_fds=True )
35	+
36	+ #first,second = self.vmstat_fd.stdout.readline(),self.vmstat_fd.stdout.readline()
37	+
38	+
39	+ # Read valid values
40	+ self._read_hostname()
41	+ self._read_cpu()
42	+ self._read_memory()
43	+ self._read_cpu_and_mem_info()
44	+
45	+ self.start()
46	+
47	+ def _read_hostname (self):
48	+ # First try: uname()
49	+ self.hostname = os.uname()[1]
50	+ if self.hostname:
51	+ return
52	+
53	+ # Second try: sysctl()
54	+ ret = popen.popen_sync ("/sbin/sysctl -n kern.hostname")
55	+ self.hostname = ret['stdout'].rstrip()
56	+ if self.hostname:
57	+ return
58	+
59	+ # Could not figure it out
60	+ self.hostname = "Unknown"
61	+
62	+ def _read_cpu_and_mem_info (self):
63	+ # Execute sysctl
64	+ ret = popen.popen_sync ("/sbin/sysctl hw.ncpu hw.clockrate kern.threads.virtual_cpu hw.pagesize vm.stats.vm.v_page_count")
65	+ lines = filter (lambda x: x, ret['stdout'].split('\n'))
66	+
67	+ # Parse output
68	+
69	+ # cpu related
70	+ ncpus = 0
71	+ vcpus = 0
72	+ clock = ''
73	+
74	+ # mem related
75	+ psize = 0
76	+ pcount = 0
77	+
78	+ for line in lines:
79	+ parts = line.split()
80	+ if parts[0] == 'hw.ncpu:':
81	+ ncpus = int(parts[1])
82	+ elif parts[0] == 'hw.clockrate:':
83	+ clock = parts[1]
84	+ elif parts[0] == 'kern.threads.virtual_cpu:':
85	+ vcpus = parts[1]
86	+ elif parts[0] == 'vm.stats.vm.v_page_count:':
87	+ pcount = int(parts[1])
88	+ elif parts[0] == 'hw.pagesize:':
89	+ psize = int(parts[1])
90	+
91	+ # Deal with cores
92	+ if vcpus:
93	+ self.cpu.num = str (int(vcpus) / int(ncpus))
94	+ self.cpu.cores = vcpus
95	+ else:
96	+ self.cpu.num = int (ncpus)
97	+ self.cpu.cores = int (ncpus)
98	+
99	+ # Global speed
100	+ self.cpu.speed = '%s MHz' %(clock)
101	+
102	+
103	+ # Physical mem
104	+ self.mem.total = (psize * pcount) / 1024
105	+
106	+ def _read_cpu (self):
107	+
108	+ # Read a new line
109	+ line = self.vmstat_fd.stdout.readline().rstrip('\n')
110	+
111	+ # Skip headers
112	+ if len(filter (lambda x: x not in " .0123456789", line)):
113	+ return
114	+
115	+ # Parse
116	+ parts = filter (lambda x: x, line.split(' '))
117	+
118	+ if not len(parts) == 18:
119	+ return
120	+
121	+ self.cpu.idle = int(parts[17])
122	+ self.cpu.usage = 100 - self.cpu.idle
123	+
124	+ def _read_memory (self):
125	+
126	+ line = self.vmstat_fd.stdout.readline().rstrip('\n')
127	+
128	+ # Skip headers
129	+ if len(filter (lambda x: x not in " .0123456789", line)):
130	+ return
131	+
132	+ # Parse
133	+ values = filter (lambda x: x, line.split(' '))
134	+
135	+ if not len(values)==18:
136	+ return
137	+
138	+ self.mem.free = int(values[4])
139	+ self.mem.used = self.mem.total - self.mem.free
140	+
141	+ def run (self):
142	+ while True:
143	+ self._read_cpu()
144	+ self._read_memory()
145	+ time.sleep (self.CHECK_INTERVAL)
146	+
147	+
148	if __name__ == '__main__':
149	sys_stats = get_system_stats()
150