<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15224] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15224">15224</a></dd>
<dt>Author</dt> <dd>trixter</dd>
<dt>Date</dt> <dd>2009-10-24 12:07:44 -0500 (Sat, 24 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>added "status" checking and not processing events if we are at the max sessions or max session rate.
The load detection is primitive, it only looks at sessions and not what the action is doing (which may not involve a session)
Additionally it does not look at the actual system load, so if you have misconfigured your max sessions you may overdrive your box and cause problems</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribtrixterscheduled_eventlua">freeswitch/trunk/contrib/trixter/scheduled_event.lua</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribtrixterscheduled_eventlua"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/trixter/scheduled_event.lua (15223 => 15224)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/trixter/scheduled_event.lua 2009-10-24 01:48:45 UTC (rev 15223)
+++ freeswitch/trunk/contrib/trixter/scheduled_event.lua 2009-10-24 17:07:44 UTC (rev 15224)
</span><span class="lines">@@ -166,29 +166,34 @@
</span><span class="cx"> event_subclass = e:getHeader("Event-Subclass") or ""
</span><span class="cx">
</span><span class="cx"> if(event_name == "HEARTBEAT") then
</span><del>- env = assert (luasql.mysql())
- dbcon = assert (env:connect(DATABASE,USERNAME,PASSWORD,DBHOST))
- while true do
- assert (dbcon:execute("LOCK TABLE "..TABLENAME.." WRITE"))
- cur = assert (dbcon:execute("select * from "..TABLENAME.." where timestamp < NOW() and (server = '"..hostname.."' or server = '*') order by timestamp limit 1"))
- row = cur:fetch({},"a")
- if not row then
- break
- end
- assert(dbcon:execute("delete from "..TABLENAME.." where acctid = "..row.acctid));
- assert (dbcon:execute("UNLOCK TABLES"))
- apicmd,apiarg = string.match(row.action,"(%w+) (.*)")
- api:execute(apicmd,apiarg)
- end
- dbcon:close()
- env:close()
</del><ins>+ -- check the system load
+ load = api:execute("status")
+ cur_sessions,rate_sessions,max_rate,max_sessions = string.match(load,"(%d+) session.s. (%d+)/(%d+)\n(%d+) session.s. max")
+ if ((tonumber(cur_sessions) < tonumber(max_sessions)) and (tonumber(rate_sessions) < tonumber(max_rate))) then
+ env = assert (luasql.mysql())
+ dbcon = assert (env:connect(DATABASE,USERNAME,PASSWORD,DBHOST))
+ while true do
+ assert (dbcon:execute("LOCK TABLE "..TABLENAME.." WRITE"))
+ cur = assert (dbcon:execute("select * from "..TABLENAME.." where timestamp < NOW() and (server = '"..hostname.."' or server = '*') order by timestamp limit 1"))
+ row = cur:fetch({},"a")
+ if not row then
+ break
+ end
+ assert(dbcon:execute("delete from "..TABLENAME.." where acctid = "..row.acctid));
+ assert (dbcon:execute("UNLOCK TABLES"))
+ apicmd,apiarg = string.match(row.action,"(%w+) (.*)")
+ api:execute(apicmd,apiarg)
+ end -- while
+ dbcon:close()
+ env:close()
+ end -- rate limiting
</ins><span class="cx"> else if (event_name == "CUSTOM" and event_subclass == "lua::scheduled_event") then
</span><span class="cx"> action = e:getHeader("Action") or ""
</span><span class="cx"> if (action == "stop") then
</span><span class="cx"> logger("got stop message, Exiting")
</span><span class="cx"> break
</span><span class="cx"> end
</span><del>- end
- end
- end
- end
</del><span class="cx">\ No newline at end of file
</span><ins>+ end -- not a custom message
+ end -- not a processable event
+ end -- foreach event
+ end -- main loop, DB connection established
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>