r5405 - in trunk: cumin/bin mint/python/mint
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2012-06-06 19:18:53 +0000 (Wed, 06 Jun 2012)
New Revision: 5405
Modified:
trunk/cumin/bin/cumin-data
trunk/mint/python/mint/main.py
trunk/mint/python/mint/util.py
trunk/mint/python/mint/vacuum.py
Log:
Additional tweaks to shutdown. Let an ongoing vacuum operation finish.
Modified: trunk/cumin/bin/cumin-data
===================================================================
--- trunk/cumin/bin/cumin-data 2012-06-06 17:33:56 UTC (rev 5404)
+++ trunk/cumin/bin/cumin-data 2012-06-06 19:18:53 UTC (rev 5405)
@@ -294,12 +294,11 @@
def shutdown():
if mint:
- mint.stop()
- log.info("about to call logging shutdown")
- logging.shutdown()
+ # Don't stop vacuum here. If a vacuum is happening,
+ # we want to let it complete. Stop it below.
+ mint.stop(skip_vacuum=True)
# Run shutdown with a timeout in the main thread.
- # This guarantees exit.
t = ShutdownThread(shutdown)
t.start()
@@ -311,6 +310,14 @@
t.join(tm)
if pipeThread:
pipeThread.stop(immediate=True)
+
+ # Vacuum is not interruptable and could take a while.
+ # This call to stop will wait for vacuum to exit
+ mint.vacuum_thread.stop()
+
+ log.info("about to call logging shutdown")
+ logging.shutdown()
+
return adjust_return(passed_init, return_code)
def make_ctrl_c(sig, frame):
Modified: trunk/mint/python/mint/main.py
===================================================================
--- trunk/mint/python/mint/main.py 2012-06-06 17:33:56 UTC (rev 5404)
+++ trunk/mint/python/mint/main.py 2012-06-06 19:18:53 UTC (rev 5405)
@@ -85,21 +85,17 @@
if self.vacuum_enabled:
self.vacuum_thread.start()
- def stop(self):
+ def stop(self, skip_vacuum=False):
log.info("Stopping %s", self)
self.update_thread.stop()
- log.info("Update thread stopped")
if self.expire_enabled:
self.expire_thread.stop()
- log.info("Expire thread stopped")
-
- if self.vacuum_enabled:
+
+ if self.vacuum_enabled and not skip_vacuum:
self.vacuum_thread.stop()
- log.info("Vacuum thread stopped")
-
self.session.stop()
log.info("Session stopped")
Modified: trunk/mint/python/mint/util.py
===================================================================
--- trunk/mint/python/mint/util.py 2012-06-06 17:33:56 UTC (rev 5404)
+++ trunk/mint/python/mint/util.py 2012-06-06 19:18:53 UTC (rev 5405)
@@ -42,6 +42,7 @@
self.stop_requested = True
if self.isAlive():
self.join(timeout)
+ log.info("%s stopped" % self.getName())
class MintBlockingDaemonThread(MintDaemonThread):
def __init__(self, app):
@@ -53,14 +54,14 @@
def stop(self, timeout=5):
try:
self._condition.acquire()
- if self.stop_requested:
- return
self.stop_requested = True
self._condition.notify()
finally:
self._condition.release()
+
if self.isAlive():
self.join(timeout)
+ log.info("%s stopped" % self.getName())
class MintPeriodicProcessThread(MintBlockingDaemonThread):
def __init__(self, app, interval):
Modified: trunk/mint/python/mint/vacuum.py
===================================================================
--- trunk/mint/python/mint/vacuum.py 2012-06-06 17:33:56 UTC (rev 5404)
+++ trunk/mint/python/mint/vacuum.py 2012-06-06 19:18:53 UTC (rev 5405)
@@ -11,6 +11,7 @@
super(VacuumThread, self).init()
log.debug("Vacuum interval is %i seconds", self.interval)
+ self.processing_vacuum = False
def run(self):
if self.interval >= 60 * 60:
@@ -23,23 +24,49 @@
if not self.stop_requested:
self._condition.wait(interval)
if self.stop_requested:
- log.debug("Periodic process %s exited" % self.getName())
return
finally:
self._condition.release()
super(VacuumThread, self).run()
+ def stop(self, timeout=5):
+ try:
+ self._condition.acquire()
+ self.stop_requested = True
+ self._condition.notify()
+ if self.processing_vacuum:
+ timeout = None # forever
+ log.info("Waiting for vacuum to finish")
+ finally:
+ self._condition.release()
+ if self.isAlive():
+ self.join(timeout)
+ log.info("%s stopped" % self.getName())
+
def process(self):
+ self._condition.acquire()
+ if self.stop_requested:
+ self._condition.release()
+ return
+
+ # Flag this so the main thread can
+ # know what we're doing
+ self.processing_vacuum = True
+ self._condition.release()
+
log.info("Starting vacuum")
conn = self.app.database.get_connection()
conn.set_isolation_level(0)
-
try:
cursor = conn.cursor()
cursor.execute("vacuum analyze")
finally:
conn.close()
+ self._condition.acquire()
+ self.processing_vacuum = False
+ self._condition.release()
+
log.info("Finished vacuum")
11 years, 11 months
r5404 - trunk/mint/python/mint
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2012-06-06 17:33:56 +0000 (Wed, 06 Jun 2012)
New Revision: 5404
Modified:
trunk/mint/python/mint/expire.py
trunk/mint/python/mint/main.py
trunk/mint/python/mint/update.py
trunk/mint/python/mint/util.py
trunk/mint/python/mint/vacuum.py
Log:
Use joins and condition variables to make thread shutdown more reliable.
Modified: trunk/mint/python/mint/expire.py
===================================================================
--- trunk/mint/python/mint/expire.py 2012-06-06 16:04:27 UTC (rev 5403)
+++ trunk/mint/python/mint/expire.py 2012-06-06 17:33:56 UTC (rev 5404)
@@ -24,9 +24,20 @@
def run(self):
if self.interval >= 60 * 60:
- time.sleep(0.25 * self.interval)
+ interval = 0.25 * self.interval
else:
- time.sleep(self.interval)
+ interval = self.interval
+
+ try:
+ self._condition.acquire()
+ if not self.stop_requested:
+ self._condition.wait(interval)
+ if self.stop_requested:
+ log.debug("Periodic process %s exited" % self.getName())
+ return
+ finally:
+ self._condition.release()
+
super(ExpireThread, self).run()
def process(self):
@@ -49,7 +60,7 @@
count = cursor.rowcount
# For timestamp persistent classes, we get rid of the
- # objects in additoin to the samples
+ # objects in addition to the samples
if hasattr(cls, "sql_timestamp_delete") and \
cls.sql_timestamp_delete is not None:
cls.sql_timestamp_delete.execute(cursor, values)
@@ -63,10 +74,14 @@
cursor = conn.cursor()
if len(self.classes) > 0:
for cls in self.classes:
+ if self.stop_requested:
+ break
count += loop_body(cls, cursor)
else:
for pkg in self.packages:
for cls in pkg._classes:
+ if self.stop_requested:
+ break
count += loop_body(cls, cursor)
finally:
conn.close()
Modified: trunk/mint/python/mint/main.py
===================================================================
--- trunk/mint/python/mint/main.py 2012-06-06 16:04:27 UTC (rev 5403)
+++ trunk/mint/python/mint/main.py 2012-06-06 17:33:56 UTC (rev 5404)
@@ -89,14 +89,19 @@
log.info("Stopping %s", self)
self.update_thread.stop()
+ log.info("Update thread stopped")
- self.session.stop()
-
if self.expire_enabled:
self.expire_thread.stop()
+ log.info("Expire thread stopped")
if self.vacuum_enabled:
self.vacuum_thread.stop()
+ log.info("Vacuum thread stopped")
+
+ self.session.stop()
+ log.info("Session stopped")
+
def __repr__(self):
return self.__class__.__name__
Modified: trunk/mint/python/mint/update.py
===================================================================
--- trunk/mint/python/mint/update.py 2012-06-06 16:04:27 UTC (rev 5403)
+++ trunk/mint/python/mint/update.py 2012-06-06 17:33:56 UTC (rev 5404)
@@ -75,11 +75,12 @@
while True:
if self.stop_requested:
break
-
try:
update = self.updates.get(True, 1)
except Empty:
continue
+ if self.stop_requested:
+ break
self.stats.dequeued += 1
Modified: trunk/mint/python/mint/util.py
===================================================================
--- trunk/mint/python/mint/util.py 2012-06-06 16:04:27 UTC (rev 5403)
+++ trunk/mint/python/mint/util.py 2012-06-06 17:33:56 UTC (rev 5404)
@@ -12,7 +12,7 @@
from qmf.console import ObjectId
from random import sample
from tempfile import mkstemp
-from threading import Thread, Lock, RLock
+from threading import Thread, Lock, RLock, Condition
from time import clock, sleep
from traceback import print_exc
@@ -29,19 +29,40 @@
self.app = app
self.name = self.__class__.__name__
-
self.stop_requested = False
self.setDaemon(True)
-
+
def init(self):
pass
- def stop(self):
- assert self.stop_requested is False
+ def stop(self, timeout=5):
+ if self.stop_requested:
+ return
self.stop_requested = True
+ if self.isAlive():
+ self.join(timeout)
-class MintPeriodicProcessThread(MintDaemonThread):
+class MintBlockingDaemonThread(MintDaemonThread):
+ def __init__(self, app):
+ super(MintBlockingDaemonThread, self).__init__(app)
+
+ self._lock = Lock()
+ self._condition = Condition(self._lock)
+
+ def stop(self, timeout=5):
+ try:
+ self._condition.acquire()
+ if self.stop_requested:
+ return
+ self.stop_requested = True
+ self._condition.notify()
+ finally:
+ self._condition.release()
+ if self.isAlive():
+ self.join(timeout)
+
+class MintPeriodicProcessThread(MintBlockingDaemonThread):
def __init__(self, app, interval):
super(MintPeriodicProcessThread, self).__init__(app)
@@ -63,10 +84,18 @@
delta = elapsed % self.interval
then = datetime.now() + timedelta(seconds=delta)
- log.debug("Sleeping until %s", then.strftime("%H:%M:%S"))
+ try:
+ self._condition.acquire()
+ if not self.stop_requested:
+ log.debug("Periodic process %s sleeping until %s" \
+ % (self.getName(), then.strftime("%H:%M:%S")))
+ self._condition.wait(delta)
+ if self.stop_requested:
+ log.debug("Periodic process %s exiting" % self.getName())
+ break
+ finally:
+ self._condition.release()
- time.sleep(delta)
-
def process(self):
pass
Modified: trunk/mint/python/mint/vacuum.py
===================================================================
--- trunk/mint/python/mint/vacuum.py 2012-06-06 16:04:27 UTC (rev 5403)
+++ trunk/mint/python/mint/vacuum.py 2012-06-06 17:33:56 UTC (rev 5404)
@@ -14,9 +14,20 @@
def run(self):
if self.interval >= 60 * 60:
- time.sleep(0.25 * self.interval)
+ interval = 0.25 * self.interval
else:
- time.sleep(self.interval)
+ interval = self.interval
+
+ try:
+ self._condition.acquire()
+ if not self.stop_requested:
+ self._condition.wait(interval)
+ if self.stop_requested:
+ log.debug("Periodic process %s exited" % self.getName())
+ return
+ finally:
+ self._condition.release()
+
super(VacuumThread, self).run()
def process(self):
@@ -27,7 +38,6 @@
try:
cursor = conn.cursor()
-
cursor.execute("vacuum analyze")
finally:
conn.close()
11 years, 11 months
r5403 - trunk/cumin/python/cumin/grid
by croberts＠fedoraproject.org
Author: croberts
Date: 2012-06-06 16:04:27 +0000 (Wed, 06 Jun 2012)
New Revision: 5403
Modified:
trunk/cumin/python/cumin/grid/dashboard.py
Log:
Adding historical charts for pool memory and cpus based on the data from plumage.
Modified: trunk/cumin/python/cumin/grid/dashboard.py
===================================================================
--- trunk/cumin/python/cumin/grid/dashboard.py 2012-06-05 17:36:50 UTC (rev 5402)
+++ trunk/cumin/python/cumin/grid/dashboard.py 2012-06-06 16:04:27 UTC (rev 5403)
@@ -45,15 +45,38 @@
def __init__(self, app, name):
super(DashboardHistory, self).__init__(app, name)
+ charts = WidgetSet(app, "charts")
+ self.add_child(charts)
+
chart = self.PoolEfficiencyChart(app, "eff", app.model.com_redhat_grid_plumage.OSUtil)
chart.stats = ["efficiency"]
chart.max_samples = 250
chart.duration.param.default = "3600"
- self.add_child(chart)
+ charts.add_child(chart)
+
+ chart = self.PoolMemoryChart(app, "fmem", app.model.com_redhat_grid_plumage.OSUtil)
+ chart.stats = ["usedmem", "freemem"]
+ chart.max_samples = 250
+ chart.duration.param.default = "3600"
+ charts.add_child(chart)
+ chart = self.PoolCpuChart(app, "fcpu", app.model.com_redhat_grid_plumage.OSUtil)
+ chart.stats = [ "usedcpu", "freecpu"]
+ chart.max_samples = 250
+ chart.duration.param.default = "3600"
+ charts.add_child(chart)
+
def render_title(self, session):
return "History"
+ class PoolMemoryChart(ReportingChart):
+ def render_title(self, session):
+ return "Pool memory"
+
+ class PoolCpuChart(ReportingChart):
+ def render_title(self, session):
+ return "Pool cpus"
+
class PoolEfficiencyChart(ReportingChart):
def render_title(self, session):
return "Pool efficiency"
@@ -663,6 +686,10 @@
options.group_column = ",".join((self.sum_column, self.act_state_column.identifier))
records = self.get_data(values, options)
+ for i in range(1,5):
+ record = records[0]
+ record = ('Linux%d' % i, 50L, 'IdleUnclaimed')
+ records.append(record)
# accumulate records by os/used|unused manually
recs_by_os = dict()
11 years, 11 months
r5402 - branches/stability/cumin/python/cumin
by croberts＠fedoraproject.org
Author: croberts
Date: 2012-06-05 17:36:50 +0000 (Tue, 05 Jun 2012)
New Revision: 5402
Modified:
branches/stability/cumin/python/cumin/main.py
Log:
Now calling add_page for stats.png (StatChartPage) and pie.png (PieChartPage) in _init_persona so that the png pie charts and png stat charts will work properly.
Modified: branches/stability/cumin/python/cumin/main.py
===================================================================
--- branches/stability/cumin/python/cumin/main.py 2012-06-04 16:48:11 UTC (rev 5401)
+++ branches/stability/cumin/python/cumin/main.py 2012-06-05 17:36:50 UTC (rev 5402)
@@ -147,6 +147,9 @@
self.about_page = AboutPage(self, "about.html")
self.add_page(self.about_page)
+ self.add_page(PieChartPage(self, "pie.png"))
+ self.add_page(StatChartPage(self, "stats.png"))
+
self.resource_page.protected = False
# Enable the modules that are associated with the
11 years, 11 months
r5401 - trunk/wooly/python/wooly
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2012-06-04 16:48:11 +0000 (Mon, 04 Jun 2012)
New Revision: 5401
Modified:
trunk/wooly/python/wooly/util.py
Log:
Add single quote to the list of characters that are escaped
BZ807970
Modified: trunk/wooly/python/wooly/util.py
===================================================================
--- trunk/wooly/python/wooly/util.py 2012-06-04 16:08:16 UTC (rev 5400)
+++ trunk/wooly/python/wooly/util.py 2012-06-04 16:48:11 UTC (rev 5401)
@@ -19,7 +19,8 @@
from parsley.collectionsex import *
-quote_entities = {'"': """}
+quote_entities = {'"': """,
+ "'": "'"}
def xml_escape(string, entities=None):
if type(string) in (str, unicode):
11 years, 11 months
r5400 - trunk/wooly/python/wooly
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2012-06-04 16:08:16 +0000 (Mon, 04 Jun 2012)
New Revision: 5400
Modified:
trunk/wooly/python/wooly/util.py
Log:
Use os.urandom for unique_id generation if available
BZ827558
Modified: trunk/wooly/python/wooly/util.py
===================================================================
--- trunk/wooly/python/wooly/util.py 2012-06-04 14:02:43 UTC (rev 5399)
+++ trunk/wooly/python/wooly/util.py 2012-06-04 16:08:16 UTC (rev 5400)
@@ -6,6 +6,7 @@
import random
import sys
import time
+import struct
from copy import copy
from cStringIO import StringIO
@@ -28,13 +29,18 @@
return string
def unique_id():
- bits0 = random.getrandbits(32)
- bits1 = random.getrandbits(32)
- bits2 = random.getrandbits(32)
- bits3 = random.getrandbits(32)
- return "%08x-%08x-%08x-%08x" % (bits0, bits1, bits2, bits3)
+ # Generate 4 unsigned integers.
+ # Take 4 bytes from urandom and interpret
+ # them as a standard-sized ('=') unsigned long ('L').
+ # Unpack returns a tuple, hence the [0].
+ try:
+ bits = [struct.unpack("=L", os.urandom(4))[0] for x in range(4)]
+ except NotImplementedError:
+ bits = [random.getrandbits(32) for x in range(4)]
+ return "%08x-%08x-%08x-%08x" % (bits[0], bits[1], bits[2], bits[3])
+
def escape_amp(string):
return str(string).replace("&", "&")
11 years, 11 months
r5399 - trunk/mint/python/mint/plumage
by croberts＠fedoraproject.org
Author: croberts
Date: 2012-06-04 14:02:43 +0000 (Mon, 04 Jun 2012)
New Revision: 5399
Modified:
trunk/mint/python/mint/plumage/session.py
Log:
Fixing a bug in the plumage data loading for inactive grids, also refactored to eliminate duplicated code.
Modified: trunk/mint/python/mint/plumage/session.py
===================================================================
--- trunk/mint/python/mint/plumage/session.py 2012-06-01 21:16:27 UTC (rev 5398)
+++ trunk/mint/python/mint/plumage/session.py 2012-06-04 14:02:43 UTC (rev 5399)
@@ -184,30 +184,38 @@
record.owner = len(self.collection.find({'ts':time,'st':'Owner'}).distinct('n'))
reduced = self.collection.map_reduce(timestamp_mapper, timestamp_reducer, temptable, query={'ts':time,})
reduced_collection = Collection(self.database,temptable)
- record.freemem = int(reduced_collection.find({'_id.st':{'$nin':['Claimed','Owner']}})[0]['value']['mem'])
- record.freecpu = int(reduced_collection.find({'_id.st':{'$nin':['Claimed','Owner']}})[0]['value']['cpu'])
- record.usedmem = int(reduced_collection.find({'_id.st':'Claimed'})[0]['value']['mem'])
- record.usedcpu = int(reduced_collection.find({'_id.st':'Claimed'})[0]['value']['cpu'])
+ result_claimed = reduced_collection.find({'_id.st':'Claimed'})
+ result_unclaimed = reduced_collection.find({'_id.st':'Unclaimed'})
+ result_owner = reduced_collection.find({'_id.st':'Owner'})
+ result_matched = reduced_collection.find({'_id.st':'Matched'})
+
+ record.freemem = self.getStat(result_unclaimed, 'mem')
+ record.freecpu = self.getStat(result_unclaimed, 'cpu')
+ record.usedmem = self.getStat(result_claimed, 'mem')
+ record.usedcpu = self.getStat(result_claimed, 'cpu')
+ record.availmem = self.getStat(result_claimed, 'mem') + self.getStat(result_unclaimed, 'mem')
+ record.availcpu = self.getStat(result_claimed, 'cpu') + self.getStat(result_unclaimed, 'cpu')
+ record.totalmem = self.getStat(result_claimed, 'mem') + self.getStat(result_unclaimed, 'mem') + self.getStat(result_owner, 'mem') + self.getStat(result_matched, 'mem')
+ record.totalcpu = self.getStat(result_claimed, 'cpu') + self.getStat(result_unclaimed, 'cpu') + self.getStat(result_owner, 'cpu') + self.getStat(result_matched, 'cpu')
- record.availmem = int(reduced_collection.find({'_id.st':'Claimed'})[0]['value']['mem']) + int(reduced_collection.find({'_id.st':'Unclaimed'})[0]['value']['mem'])
- record.availcpu = int(reduced_collection.find({'_id.st':'Claimed'})[0]['value']['cpu']) + int(reduced_collection.find({'_id.st':'Unclaimed'})[0]['value']['cpu'])
-
- record.totalmem = int(reduced_collection.find({'_id.st':'Claimed'})[0]['value']['mem']) + \
- int(reduced_collection.find({'_id.st':'Unclaimed'})[0]['value']['mem']) + \
- int(reduced_collection.find({'_id.st':'Owner'})[0]['value']['mem'])
-
- record.totalcpu = int(reduced_collection.find({'_id.st':'Claimed'})[0]['value']['cpu']) + \
- int(reduced_collection.find({'_id.st':'Unclaimed'})[0]['value']['cpu']) + \
- int(reduced_collection.find({'_id.st':'Owner'})[0]['value']['cpu'])
-
if(record.total != record.owner):
record.efficiency = (record.used/(record.total-record.owner))*100
else:
record.efficiency = 0
record.ts = time - UTC_DIFF
return record
+
+ def getStat(self, result_object, item):
+ itemcount = 0
+ try:
+ itemcount = result_object[0]['value'][item]
+ except:
+ return 0
+ return itemcount
+
+
def run(self):
while True:
self._check_connection()
11 years, 11 months
r5398 - in trunk: cumin/python/cumin/account wooly/python/wooly
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2012-06-01 21:16:27 +0000 (Fri, 01 Jun 2012)
New Revision: 5398
Modified:
trunk/cumin/python/cumin/account/widgets.py
trunk/wooly/python/wooly/__init__.py
trunk/wooly/python/wooly/pages.py
Log:
Add general session checks to most pages.
Modified: trunk/cumin/python/cumin/account/widgets.py
===================================================================
--- trunk/cumin/python/cumin/account/widgets.py 2012-06-01 15:51:07 UTC (rev 5397)
+++ trunk/cumin/python/cumin/account/widgets.py 2012-06-01 21:16:27 UTC (rev 5398)
@@ -76,6 +76,10 @@
form = LoginForm(app, "form")
self.add_child(form)
+ # Make sure that we don't force a user to
+ # be logged in when visiting the login page!
+ self.check_login = False
+
def do_process(self, session):
if self.logout.get(session):
try:
Modified: trunk/wooly/python/wooly/__init__.py
===================================================================
--- trunk/wooly/python/wooly/__init__.py 2012-06-01 15:51:07 UTC (rev 5397)
+++ trunk/wooly/python/wooly/__init__.py 2012-06-01 21:16:27 UTC (rev 5398)
@@ -114,6 +114,7 @@
self.update_enabled = False
self.defer_enabled = False
self.comments_enabled = True
+ self.check_login = False
# These are computed later in the init pass
self.ancestors = None
@@ -292,7 +293,23 @@
# when a user is not authorized for this widget.
pass
+ def authorized(self, session):
+ login = session.client_session.attributes.get("login_session")
+ if login:
+ when = datetime.now() - timedelta(hours=24)
+ if login.created > when:
+ return True
+ return False
+
def process(self, session, *args):
+ if self.check_login and not self.authorized(session):
+ # redirect to the login page
+ page = self.app.login_page
+ sess = Session(page)
+ page.origin.set(sess, session.marshal())
+ self.redirect.set(session, sess.marshal())
+ return
+
if not self.app.authorize_cb(session, self):
self.redirect_on_not_authorized(session)
else:
@@ -424,6 +441,10 @@
self.profile = self.ProfileAttribute(app, "profile")
self.add_attribute(self.profile)
+ # All pages should only be processed if the user
+ # is logged in, except for the login page, resource, and css.
+ self.check_login = True
+
def init_computed_values(self):
self.ancestors = ()
self.path = ""
Modified: trunk/wooly/python/wooly/pages.py
===================================================================
--- trunk/wooly/python/wooly/pages.py 2012-06-01 15:51:07 UTC (rev 5397)
+++ trunk/wooly/python/wooly/pages.py 2012-06-01 21:16:27 UTC (rev 5398)
@@ -335,6 +335,7 @@
self.html_page = html_page
self.__then = datetime.utcnow()
self.__css = None
+ self.check_login = False
def get_last_modified(self, session):
return self.__then
@@ -430,6 +431,7 @@
self.add_parameter(self.rname)
self.then = datetime.utcnow()
+ self.check_login = False
def get_last_modified(self, session):
return self.then
11 years, 11 months
r5397 - branches/stability/cumin/etc
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2012-06-01 15:51:07 +0000 (Fri, 01 Jun 2012)
New Revision: 5397
Modified:
branches/stability/cumin/etc/cumin.conf
Log:
Tweak comments in cumin.conf
Modified: branches/stability/cumin/etc/cumin.conf
===================================================================
--- branches/stability/cumin/etc/cumin.conf 2012-05-31 16:42:28 UTC (rev 5396)
+++ branches/stability/cumin/etc/cumin.conf 2012-06-01 15:51:07 UTC (rev 5397)
@@ -185,15 +185,11 @@
## sasl-mech-list:
## A space separated list that restricts the SASL mechanisms
-## Cumin may use when authenticating to the broker. By default
-## Cumin will use ANONYMOUS authentication if the broker URL does
-## not contain user/password and will use PLAIN or DIGEST-MD5
-## if the broker URL does contain user/password. DIGEST-MD5 is
-## considered more secure than PLAIN by SASL and will be
-## used if is available. This value may be set explicitly
-## to make other choices.
-## Setting the value to 'AVAILABLE' will allow Cumin to use
-## any available mechanism including ANONYMOUS.
+## Cumin may use when authenticating to the broker. Since
+## Cumin must connect to the broker with credentials for
+## full operability, it is recommended that the list be
+## set to available password mechanisms with ANONYMOUS
+## omitted.
## wallaby-broker: [first item in 'brokers' list]
## The broker to use for interaction with a Wallaby agent.
@@ -251,7 +247,7 @@
## set and valid, Cumin will use ssl. The scheme in the
## Cumin URL will be "https://" instead of "http://".
-## persona: grid
+## persona: default
## Controls content of the top level page.
## Valid values are "default", "grid", and "messaging".
## The "default" persona contains content for both grid and
11 years, 11 months