Navigation Menu

Skip to content

Commit

Permalink
Kill phantoms on uncaught exception in dbg mode
Browse files Browse the repository at this point in the history
  • Loading branch information
jdoerrie committed Apr 23, 2015
1 parent 4f25ffe commit 8d5123a
Show file tree
Hide file tree
Showing 18 changed files with 200 additions and 113 deletions.
11 changes: 9 additions & 2 deletions docs/doc-script.js
Expand Up @@ -210,7 +210,13 @@ function switchTab(tab){
*
* When the document is ready, make the sidebar and all that jazz
*/
window.onload = function(){
(function (init) {
if (window.addEventListener) {
window.addEventListener('DOMContentLoaded', init);
} else { // IE8 and below
window.onload = init;
}
}(function(){
makeTree(tree, relativeDir, thisFile);
wireUpTabs();

Expand All @@ -220,4 +226,5 @@ window.onload = function(){
}else{
switchTab('tree');
}
};
}));

10 changes: 8 additions & 2 deletions docs/doc-style.css
Expand Up @@ -306,6 +306,10 @@ a {

td.code, .background {
border-left-color: #dededc; }

td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 125%; }
body .highlight .hll { background-color: #ffffcc }
body .highlight { background: #f8f8f8; }
body .highlight .c { color: #408080; font-style: italic } /* Comment */
Expand All @@ -321,11 +325,11 @@ body .highlight .ge { font-style: italic } /* Generic.Emph */
body .highlight .gr { color: #FF0000 } /* Generic.Error */
body .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
body .highlight .gi { color: #00A000 } /* Generic.Inserted */
body .highlight .go { color: #808080 } /* Generic.Output */
body .highlight .go { color: #888888 } /* Generic.Output */
body .highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
body .highlight .gs { font-weight: bold } /* Generic.Strong */
body .highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
body .highlight .gt { color: #0040D0 } /* Generic.Traceback */
body .highlight .gt { color: #0044DD } /* Generic.Traceback */
body .highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
body .highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
body .highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
Expand Down Expand Up @@ -368,3 +372,5 @@ body .highlight .vc { color: #19177C } /* Name.Variable.Class */
body .highlight .vg { color: #19177C } /* Name.Variable.Global */
body .highlight .vi { color: #19177C } /* Name.Variable.Instance */
body .highlight .il { color: #666666 } /* Literal.Number.Integer.Long */


1 change: 1 addition & 0 deletions docs/index.js.html
Expand Up @@ -69,6 +69,7 @@ <h1>
</tr>
</tbody>
</table>

</div>
</body>
</html>
1 change: 1 addition & 0 deletions docs/lib/ChannelRegistry.js.html
Expand Up @@ -1806,6 +1806,7 @@ <h3>
</tr>
</tbody>
</table>

</div>
</body>
</html>
1 change: 1 addition & 0 deletions docs/lib/GameMsgGenerator.js.html
Expand Up @@ -264,6 +264,7 @@ <h3>
</tr>
</tbody>
</table>

</div>
</body>
</html>
13 changes: 12 additions & 1 deletion docs/lib/GameRoom.js.html
Expand Up @@ -761,8 +761,18 @@ <h3>
command, or one of the following strings:
'all' (all clients), 'players' (all players), 'admins' (all admins)</span>
</div>
</div>
<div class="dox_tag_title">private
</div>


<div class="highlight"><pre><code><span class="o">&lt;</span><span class="nx">div</span> <span class="kr">class</span><span class="o">=</span><span class="s2">&quot;dox_tag_detail&quot;</span><span class="o">&gt;</span>
<span class="o">&lt;</span><span class="err">/div&gt;</span>
</code></pre></div>



<p></div>
</div></p>
</td>
<td class="code highlight"><div class="highlight"><pre>
<span class="nx">GameRoom</span><span class="p">.</span><span class="nx">prototype</span><span class="p">.</span><span class="nx">sendRemoteCommand</span> <span class="o">=</span> <span class="kd">function</span><span class="p">(</span><span class="nx">command</span><span class="p">,</span> <span class="nx">clientList</span><span class="p">)</span> <span class="p">{</span>
Expand Down Expand Up @@ -1631,6 +1641,7 @@ <h3>
</tr>
</tbody>
</table>

</div>
</body>
</html>
15 changes: 10 additions & 5 deletions docs/lib/GameServer.js.html
Expand Up @@ -1135,6 +1135,10 @@ <h3>
<span class="dox_type">Socket</span>
<span>The sockect object</span>
</div>
<div class="dox_tag_title">emit</div>
<div class="dox_tag_detail">
<span>disconnect</span>
</div>
</div>
</div>
</td>
Expand Down Expand Up @@ -2331,11 +2335,11 @@ <h3>
<a class="pilcrow" href="#section-89" id="section-89">&#182;</a>
</div>

<div class="highlight"><pre><code> <span class="n">this</span><span class="o">.</span><span class="n">socketManager</span><span class="o">.</span><span class="nb">send</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">msg</span><span class="o">.</span><span class="n">create</span><span class="p">({</span>
<span class="n">target:</span> <span class="n">ngc</span><span class="o">.</span><span class="n">constants</span><span class="o">.</span><span class="n">target</span><span class="o">.</span><span class="n">ALERT</span><span class="p">,</span>
<span class="n">to:</span> <span class="n">clientId</span><span class="p">,</span>
<span class="n">text:</span> <span class="s">&#39;An invalid session cookie has been found. &#39;</span> <span class="o">+</span>
<span class="s">&#39;This will be considered as a new connection.&#39;</span>
<div class="highlight"><pre><code> <span class="k">this</span><span class="p">.</span><span class="nx">socketManager</span><span class="p">.</span><span class="nx">send</span><span class="p">(</span><span class="k">this</span><span class="p">.</span><span class="nx">msg</span><span class="p">.</span><span class="nx">create</span><span class="p">({</span>
<span class="nx">target</span><span class="o">:</span> <span class="nx">ngc</span><span class="p">.</span><span class="nx">constants</span><span class="p">.</span><span class="nx">target</span><span class="p">.</span><span class="nx">ALERT</span><span class="p">,</span>
<span class="nx">to</span><span class="o">:</span> <span class="nx">clientId</span><span class="p">,</span>
<span class="nx">text</span><span class="o">:</span> <span class="s1">&#39;An invalid session cookie has been found. &#39;</span> <span class="o">+</span>
<span class="s1">&#39;This will be considered as a new connection.&#39;</span>
<span class="p">}));</span>
</code></pre></div>

Expand Down Expand Up @@ -3060,6 +3064,7 @@ <h4>
</tr>
</tbody>
</table>

</div>
</body>
</html>
1 change: 1 addition & 0 deletions docs/lib/Logger.js.html
Expand Up @@ -271,6 +271,7 @@ <h3>
</tr>
</tbody>
</table>

</div>
</body>
</html>
1 change: 1 addition & 0 deletions docs/lib/PageManager.js.html
Expand Up @@ -640,6 +640,7 @@ <h3>
</tr>
</tbody>
</table>

</div>
</body>
</html>
15 changes: 8 additions & 7 deletions docs/lib/ServerChannel.js.html
Expand Up @@ -2516,18 +2516,18 @@ <h3>
if (c.admin) {</p>


<div class="highlight"><pre><code> <span class="sr">//</span> <span class="n">This</span> <span class="n">is</span> <span class="n">correct</span> <span class="n">but</span> <span class="n">too</span> <span class="n">much</span><span class="o">...</span>
<span class="sr">//</span><span class="n">that</span><span class="o">.</span><span class="n">admin</span><span class="o">.</span><span class="nb">socket</span><span class="o">.</span><span class="n">clients</span><span class="p">[</span><span class="n">c</span><span class="o">.</span><span class="n">id</span><span class="p">]</span><span class="o">.</span><span class="n">disconnect</span><span class="p">(</span><span class="n">c</span><span class="o">.</span><span class="n">sid</span><span class="p">);</span>
<div class="highlight"><pre><code> <span class="c1">// This is correct but too much...</span>
<span class="c1">//that.admin.socket.clients[c.id].disconnect(c.sid);</span>


<span class="nb">delete</span> <span class="n">that</span><span class="o">.</span><span class="n">admin</span><span class="o">.</span><span class="nb">socket</span><span class="o">.</span><span class="n">clients</span><span class="p">[</span><span class="n">c</span><span class="o">.</span><span class="n">id</span><span class="p">]</span><span class="o">.</span><span class="n">clients</span><span class="p">[</span><span class="n">c</span><span class="o">.</span><span class="n">sid</span><span class="p">];</span>
<span class="k">delete</span> <span class="nx">that</span><span class="p">.</span><span class="nx">admin</span><span class="p">.</span><span class="nx">socket</span><span class="p">.</span><span class="nx">clients</span><span class="p">[</span><span class="nx">c</span><span class="p">.</span><span class="nx">id</span><span class="p">].</span><span class="nx">clients</span><span class="p">[</span><span class="nx">c</span><span class="p">.</span><span class="nx">sid</span><span class="p">];</span>
<span class="p">}</span>
<span class="k">else</span> <span class="p">{</span>
<span class="sr">//</span> <span class="n">This</span> <span class="n">is</span> <span class="n">correct</span> <span class="n">but</span> <span class="n">too</span> <span class="n">much</span><span class="o">...</span>
<span class="sr">//</span><span class="n">that</span><span class="o">.</span><span class="n">player</span><span class="o">.</span><span class="nb">socket</span><span class="o">.</span><span class="n">clients</span><span class="p">[</span><span class="n">c</span><span class="o">.</span><span class="n">id</span><span class="p">]</span><span class="o">.</span><span class="n">disconnect</span><span class="p">(</span><span class="n">c</span><span class="o">.</span><span class="n">sid</span><span class="p">);</span>
<span class="c1">// This is correct but too much...</span>
<span class="c1">//that.player.socket.clients[c.id].disconnect(c.sid);</span>

<span class="n">that</span><span class="o">.</span><span class="n">player</span><span class="o">.</span><span class="nb">socket</span><span class="o">.</span><span class="n">clients</span><span class="p">[</span><span class="n">c</span><span class="o">.</span><span class="n">id</span><span class="p">]</span><span class="o">.</span><span class="n">sio</span><span class="o">.</span><span class="n">sockets</span><span class="o">.</span>
<span class="n">sockets</span><span class="p">[</span><span class="n">c</span><span class="o">.</span><span class="n">sid</span><span class="o">.</span><span class="n">slice</span><span class="p">(</span><span class="mi">2</span><span class="p">)]</span><span class="o">.</span><span class="n">disconnect</span><span class="p">();</span>
<span class="nx">that</span><span class="p">.</span><span class="nx">player</span><span class="p">.</span><span class="nx">socket</span><span class="p">.</span><span class="nx">clients</span><span class="p">[</span><span class="nx">c</span><span class="p">.</span><span class="nx">id</span><span class="p">].</span><span class="nx">sio</span><span class="p">.</span><span class="nx">sockets</span><span class="p">.</span>
<span class="nx">sockets</span><span class="p">[</span><span class="nx">c</span><span class="p">.</span><span class="nx">sid</span><span class="p">.</span><span class="nx">slice</span><span class="p">(</span><span class="mi">2</span><span class="p">)].</span><span class="nx">disconnect</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
Expand Down Expand Up @@ -2600,6 +2600,7 @@ <h3>
</tr>
</tbody>
</table>

</div>
</body>
</html>

0 comments on commit 8d5123a

Please sign in to comment.