diff --git a/doc/html/namespacesuper_tornado.html b/doc/html/namespacesuper_tornado.html
index 71dbf37..d47f441 100644
--- a/doc/html/namespacesuper_tornado.html
+++ b/doc/html/namespacesuper_tornado.html
@@ -33,7 +33,7 @@
@@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('pages.html','');});
diff --git a/doc/latex/classm_1_1load_conf_1_1_config_error.pdf b/doc/latex/classm_1_1load_conf_1_1_config_error.pdf
index 68af8c9..23a54b9 100644
Binary files a/doc/latex/classm_1_1load_conf_1_1_config_error.pdf and b/doc/latex/classm_1_1load_conf_1_1_config_error.pdf differ
diff --git a/doc/latex/classm_1_1load_conf_1_1_load_conf.pdf b/doc/latex/classm_1_1load_conf_1_1_load_conf.pdf
index c0c5bc1..942deeb 100644
Binary files a/doc/latex/classm_1_1load_conf_1_1_load_conf.pdf and b/doc/latex/classm_1_1load_conf_1_1_load_conf.pdf differ
diff --git a/doc/latex/classm_1_1log_1_1_log.pdf b/doc/latex/classm_1_1log_1_1_log.pdf
index 3e48ec8..c5597dd 100644
Binary files a/doc/latex/classm_1_1log_1_1_log.pdf and b/doc/latex/classm_1_1log_1_1_log.pdf differ
diff --git a/doc/latex/classm_1_1log_1_1_single_level_filter.pdf b/doc/latex/classm_1_1log_1_1_single_level_filter.pdf
index 5e61203..2cfabdd 100644
Binary files a/doc/latex/classm_1_1log_1_1_single_level_filter.pdf and b/doc/latex/classm_1_1log_1_1_single_level_filter.pdf differ
diff --git a/doc/latex/classm_1_1login_1_1_login.pdf b/doc/latex/classm_1_1login_1_1_login.pdf
index 32c6bd1..8f2c0bc 100644
Binary files a/doc/latex/classm_1_1login_1_1_login.pdf and b/doc/latex/classm_1_1login_1_1_login.pdf differ
diff --git a/doc/latex/classsuper_tornado_1_1_base_handler.pdf b/doc/latex/classsuper_tornado_1_1_base_handler.pdf
index b58bcbe..21d56ed 100644
Binary files a/doc/latex/classsuper_tornado_1_1_base_handler.pdf and b/doc/latex/classsuper_tornado_1_1_base_handler.pdf differ
diff --git a/doc/latex/classsuper_tornado_1_1_base_handler.tex b/doc/latex/classsuper_tornado_1_1_base_handler.tex
index 9bab757..0ecec2b 100644
--- a/doc/latex/classsuper_tornado_1_1_base_handler.tex
+++ b/doc/latex/classsuper_tornado_1_1_base_handler.tex
@@ -35,4 +35,4 @@ else null
The documentation for this class was generated from the following file\-:\begin{DoxyCompactItemize}
\item
-c/super\-Tornado.\-py\end{DoxyCompactItemize}
+super\-Tornado.\-py\end{DoxyCompactItemize}
diff --git a/doc/latex/classsuper_tornado_1_1_disconnection_handler.pdf b/doc/latex/classsuper_tornado_1_1_disconnection_handler.pdf
index 4bc00e0..2b763e6 100644
Binary files a/doc/latex/classsuper_tornado_1_1_disconnection_handler.pdf and b/doc/latex/classsuper_tornado_1_1_disconnection_handler.pdf differ
diff --git a/doc/latex/classsuper_tornado_1_1_disconnection_handler.tex b/doc/latex/classsuper_tornado_1_1_disconnection_handler.tex
index f73b9a8..19afc4d 100644
--- a/doc/latex/classsuper_tornado_1_1_disconnection_handler.tex
+++ b/doc/latex/classsuper_tornado_1_1_disconnection_handler.tex
@@ -33,4 +33,4 @@ def \hyperlink{classsuper_tornado_1_1_disconnection_handler_a342baf9e09790a755c5
The documentation for this class was generated from the following file\-:\begin{DoxyCompactItemize}
\item
-c/super\-Tornado.\-py\end{DoxyCompactItemize}
+super\-Tornado.\-py\end{DoxyCompactItemize}
diff --git a/doc/latex/classsuper_tornado_1_1_global_vars.tex b/doc/latex/classsuper_tornado_1_1_global_vars.tex
index 3a235eb..3294dcb 100644
--- a/doc/latex/classsuper_tornado_1_1_global_vars.tex
+++ b/doc/latex/classsuper_tornado_1_1_global_vars.tex
@@ -4,7 +4,7 @@
\subsection*{Static Public Attributes}
\begin{DoxyCompactItemize}
\item
-\hypertarget{classsuper_tornado_1_1_global_vars_a0091cf90c3955b9dd9917e441d6d307f}{tuple {\bfseries config} = \hyperlink{classm_1_1load_conf_1_1_load_conf}{Load\-Conf}(\char`\"{}../m/file/conf\char`\"{})}\label{classsuper_tornado_1_1_global_vars_a0091cf90c3955b9dd9917e441d6d307f}
+\hypertarget{classsuper_tornado_1_1_global_vars_a0091cf90c3955b9dd9917e441d6d307f}{tuple {\bfseries config} = \hyperlink{classm_1_1load_conf_1_1_load_conf}{Load\-Conf}(\char`\"{}m/file/conf\char`\"{})}\label{classsuper_tornado_1_1_global_vars_a0091cf90c3955b9dd9917e441d6d307f}
\item
\hypertarget{classsuper_tornado_1_1_global_vars_a027c191330c93fb0ce920d0c0cd7b8b2}{tuple {\bfseries log} = \hyperlink{classm_1_1log_1_1_log}{Log}()}\label{classsuper_tornado_1_1_global_vars_a027c191330c93fb0ce920d0c0cd7b8b2}
@@ -58,4 +58,4 @@
The documentation for this class was generated from the following file\-:\begin{DoxyCompactItemize}
\item
-c/super\-Tornado.\-py\end{DoxyCompactItemize}
+super\-Tornado.\-py\end{DoxyCompactItemize}
diff --git a/doc/latex/classsuper_tornado_1_1_main_handler.pdf b/doc/latex/classsuper_tornado_1_1_main_handler.pdf
index 9e1939f..91fe833 100644
Binary files a/doc/latex/classsuper_tornado_1_1_main_handler.pdf and b/doc/latex/classsuper_tornado_1_1_main_handler.pdf differ
diff --git a/doc/latex/classsuper_tornado_1_1_main_handler.tex b/doc/latex/classsuper_tornado_1_1_main_handler.tex
index e8aa323..e20004d 100644
--- a/doc/latex/classsuper_tornado_1_1_main_handler.tex
+++ b/doc/latex/classsuper_tornado_1_1_main_handler.tex
@@ -48,4 +48,4 @@ else
The documentation for this class was generated from the following file\-:\begin{DoxyCompactItemize}
\item
-c/super\-Tornado.\-py\end{DoxyCompactItemize}
+super\-Tornado.\-py\end{DoxyCompactItemize}
diff --git a/doc/latex/classsuper_tornado_1_1_unauthorized_handler.pdf b/doc/latex/classsuper_tornado_1_1_unauthorized_handler.pdf
index fe5bafc..8e71e82 100644
Binary files a/doc/latex/classsuper_tornado_1_1_unauthorized_handler.pdf and b/doc/latex/classsuper_tornado_1_1_unauthorized_handler.pdf differ
diff --git a/doc/latex/classsuper_tornado_1_1_unauthorized_handler.tex b/doc/latex/classsuper_tornado_1_1_unauthorized_handler.tex
index 877ca7e..2c1ac96 100644
--- a/doc/latex/classsuper_tornado_1_1_unauthorized_handler.tex
+++ b/doc/latex/classsuper_tornado_1_1_unauthorized_handler.tex
@@ -48,4 +48,4 @@ else
The documentation for this class was generated from the following file\-:\begin{DoxyCompactItemize}
\item
-c/super\-Tornado.\-py\end{DoxyCompactItemize}
+super\-Tornado.\-py\end{DoxyCompactItemize}
diff --git a/doc/latex/classsuper_tornado_1_1_video_handler.pdf b/doc/latex/classsuper_tornado_1_1_video_handler.pdf
index 92ce0a4..9a9e444 100644
Binary files a/doc/latex/classsuper_tornado_1_1_video_handler.pdf and b/doc/latex/classsuper_tornado_1_1_video_handler.pdf differ
diff --git a/doc/latex/classsuper_tornado_1_1_video_handler.tex b/doc/latex/classsuper_tornado_1_1_video_handler.tex
index 3b3e4ef..42b4061 100644
--- a/doc/latex/classsuper_tornado_1_1_video_handler.tex
+++ b/doc/latex/classsuper_tornado_1_1_video_handler.tex
@@ -37,4 +37,4 @@ Else
The documentation for this class was generated from the following file\-:\begin{DoxyCompactItemize}
\item
-c/super\-Tornado.\-py\end{DoxyCompactItemize}
+super\-Tornado.\-py\end{DoxyCompactItemize}
diff --git a/doc/latex/classsuper_tornado_1_1_w_socket_handler.pdf b/doc/latex/classsuper_tornado_1_1_w_socket_handler.pdf
index f60d10d..bc336cf 100644
Binary files a/doc/latex/classsuper_tornado_1_1_w_socket_handler.pdf and b/doc/latex/classsuper_tornado_1_1_w_socket_handler.pdf differ
diff --git a/doc/latex/classsuper_tornado_1_1_w_socket_handler.tex b/doc/latex/classsuper_tornado_1_1_w_socket_handler.tex
index c88ccd7..703e586 100644
--- a/doc/latex/classsuper_tornado_1_1_w_socket_handler.tex
+++ b/doc/latex/classsuper_tornado_1_1_w_socket_handler.tex
@@ -85,4 +85,4 @@ else
The documentation for this class was generated from the following file\-:\begin{DoxyCompactItemize}
\item
-c/super\-Tornado.\-py\end{DoxyCompactItemize}
+super\-Tornado.\-py\end{DoxyCompactItemize}
diff --git a/doc/latex/refman.tex b/doc/latex/refman.tex
index a985732..1ec4e2f 100644
--- a/doc/latex/refman.tex
+++ b/doc/latex/refman.tex
@@ -67,8 +67,8 @@
\fancyhead[RO]{\fancyplain{}{\bfseries\thepage}}
\fancyfoot[LE]{\fancyplain{}{}}
\fancyfoot[CE]{\fancyplain{}{}}
-\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Apr 2 2014 12\-:11\-:01 for M\-I Protect Privacy by Doxygen }}
-\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Apr 2 2014 12\-:11\-:01 for M\-I Protect Privacy by Doxygen }}
+\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Apr 3 2014 15\-:02\-:02 for M\-I Protect Privacy by Doxygen }}
+\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Apr 3 2014 15\-:02\-:02 for M\-I Protect Privacy by Doxygen }}
\fancyfoot[CO]{\fancyplain{}{}}
\fancyfoot[RO]{\fancyplain{}{}}
\renewcommand{\footrulewidth}{0.4pt}
@@ -120,7 +120,7 @@
\vspace*{1cm}
{\large Generated by Doxygen 1.8.6}\\
\vspace*{0.5cm}
-{\small Wed Apr 2 2014 12:11:01}\\
+{\small Thu Apr 3 2014 15:02:02}\\
\end{center}
\end{titlepage}
\clearemptydoublepage
diff --git a/doc/man/man3/_home_sidya_Documents_iut_ptut_m_.3 b/doc/man/man3/_home_sidya_Documents_iut_ptut_m_.3
index 5f76355..69a41e2 100644
--- a/doc/man/man3/_home_sidya_Documents_iut_ptut_m_.3
+++ b/doc/man/man3/_home_sidya_Documents_iut_ptut_m_.3
@@ -1,4 +1,4 @@
-.TH "m Directory Reference" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m Directory Reference" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/_home_sidya_Documents_iut_ptut_v_.3 b/doc/man/man3/_home_sidya_Documents_iut_ptut_v_.3
index 5d3e9f7..3788c00 100644
--- a/doc/man/man3/_home_sidya_Documents_iut_ptut_v_.3
+++ b/doc/man/man3/_home_sidya_Documents_iut_ptut_v_.3
@@ -1,4 +1,4 @@
-.TH "v Directory Reference" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "v Directory Reference" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/_home_sidya_Documents_iut_ptut_v_js_.3 b/doc/man/man3/_home_sidya_Documents_iut_ptut_v_js_.3
index 77b658b..d9fd389 100644
--- a/doc/man/man3/_home_sidya_Documents_iut_ptut_v_js_.3
+++ b/doc/man/man3/_home_sidya_Documents_iut_ptut_v_js_.3
@@ -1,4 +1,4 @@
-.TH "v/js Directory Reference" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "v/js Directory Reference" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/m_loadConf_ConfigError.3 b/doc/man/man3/m_loadConf_ConfigError.3
index d43cb2e..5d5c799 100644
--- a/doc/man/man3/m_loadConf_ConfigError.3
+++ b/doc/man/man3/m_loadConf_ConfigError.3
@@ -1,4 +1,4 @@
-.TH "m.loadConf.ConfigError" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m.loadConf.ConfigError" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/m_loadConf_LoadConf.3 b/doc/man/man3/m_loadConf_LoadConf.3
index 480e64d..a680770 100644
--- a/doc/man/man3/m_loadConf_LoadConf.3
+++ b/doc/man/man3/m_loadConf_LoadConf.3
@@ -1,4 +1,4 @@
-.TH "m.loadConf.LoadConf" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m.loadConf.LoadConf" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/m_log_Log.3 b/doc/man/man3/m_log_Log.3
index 6523d7c..4b479ed 100644
--- a/doc/man/man3/m_log_Log.3
+++ b/doc/man/man3/m_log_Log.3
@@ -1,4 +1,4 @@
-.TH "m.log.Log" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m.log.Log" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/m_log_SingleLevelFilter.3 b/doc/man/man3/m_log_SingleLevelFilter.3
index 60e15fc..ce6b38b 100644
--- a/doc/man/man3/m_log_SingleLevelFilter.3
+++ b/doc/man/man3/m_log_SingleLevelFilter.3
@@ -1,4 +1,4 @@
-.TH "m.log.SingleLevelFilter" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m.log.SingleLevelFilter" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/m_log_bcolors.3 b/doc/man/man3/m_log_bcolors.3
index 0b68bb6..258590c 100644
--- a/doc/man/man3/m_log_bcolors.3
+++ b/doc/man/man3/m_log_bcolors.3
@@ -1,4 +1,4 @@
-.TH "m.log.bcolors" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m.log.bcolors" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/m_log_lvl.3 b/doc/man/man3/m_log_lvl.3
index 3cef63b..0f46654 100644
--- a/doc/man/man3/m_log_lvl.3
+++ b/doc/man/man3/m_log_lvl.3
@@ -1,4 +1,4 @@
-.TH "m.log.lvl" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m.log.lvl" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/m_login_Login.3 b/doc/man/man3/m_login_Login.3
index c809266..7bd0f10 100644
--- a/doc/man/man3/m_login_Login.3
+++ b/doc/man/man3/m_login_Login.3
@@ -1,4 +1,4 @@
-.TH "m.login.Login" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "m.login.Login" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/md__r_e_a_d_m_e.3 b/doc/man/man3/md__r_e_a_d_m_e.3
index 1ee59fe..76cd13d 100644
--- a/doc/man/man3/md__r_e_a_d_m_e.3
+++ b/doc/man/man3/md__r_e_a_d_m_e.3
@@ -1,4 +1,4 @@
-.TH "md__r_e_a_d_m_e" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "md__r_e_a_d_m_e" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/superTornado.3 b/doc/man/man3/superTornado.3
index b7725c0..5071a30 100644
--- a/doc/man/man3/superTornado.3
+++ b/doc/man/man3/superTornado.3
@@ -1,4 +1,4 @@
-.TH "superTornado" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/superTornado_BaseHandler.3 b/doc/man/man3/superTornado_BaseHandler.3
index 738cdf3..b47cc7f 100644
--- a/doc/man/man3/superTornado_BaseHandler.3
+++ b/doc/man/man3/superTornado_BaseHandler.3
@@ -1,4 +1,4 @@
-.TH "superTornado.BaseHandler" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado.BaseHandler" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/superTornado_DisconnectionHandler.3 b/doc/man/man3/superTornado_DisconnectionHandler.3
index 11a964f..801f907 100644
--- a/doc/man/man3/superTornado_DisconnectionHandler.3
+++ b/doc/man/man3/superTornado_DisconnectionHandler.3
@@ -1,4 +1,4 @@
-.TH "superTornado.DisconnectionHandler" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado.DisconnectionHandler" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/superTornado_GlobalVars.3 b/doc/man/man3/superTornado_GlobalVars.3
index 654bc60..8e19857 100644
--- a/doc/man/man3/superTornado_GlobalVars.3
+++ b/doc/man/man3/superTornado_GlobalVars.3
@@ -1,4 +1,4 @@
-.TH "superTornado.GlobalVars" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado.GlobalVars" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,7 +10,7 @@ superTornado.GlobalVars \-
.in +1c
.ti -1c
-.RI "tuple \fBconfig\fP = \fBLoadConf\fP('\&.\&./m/file/conf')"
+.RI "tuple \fBconfig\fP = \fBLoadConf\fP('m/file/conf')"
.br
.ti -1c
.RI "tuple \fBlog\fP = \fBLog\fP()"
diff --git a/doc/man/man3/superTornado_MainHandler.3 b/doc/man/man3/superTornado_MainHandler.3
index 770e830..41c7587 100644
--- a/doc/man/man3/superTornado_MainHandler.3
+++ b/doc/man/man3/superTornado_MainHandler.3
@@ -1,4 +1,4 @@
-.TH "superTornado.MainHandler" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado.MainHandler" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/superTornado_UnauthorizedHandler.3 b/doc/man/man3/superTornado_UnauthorizedHandler.3
index 290c79f..09d0cac 100644
--- a/doc/man/man3/superTornado_UnauthorizedHandler.3
+++ b/doc/man/man3/superTornado_UnauthorizedHandler.3
@@ -1,4 +1,4 @@
-.TH "superTornado.UnauthorizedHandler" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado.UnauthorizedHandler" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/superTornado_VideoHandler.3 b/doc/man/man3/superTornado_VideoHandler.3
index 7bc3a87..db8d026 100644
--- a/doc/man/man3/superTornado_VideoHandler.3
+++ b/doc/man/man3/superTornado_VideoHandler.3
@@ -1,4 +1,4 @@
-.TH "superTornado.VideoHandler" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado.VideoHandler" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/doc/man/man3/superTornado_WSocketHandler.3 b/doc/man/man3/superTornado_WSocketHandler.3
index cbe977e..4f5851b 100644
--- a/doc/man/man3/superTornado_WSocketHandler.3
+++ b/doc/man/man3/superTornado_WSocketHandler.3
@@ -1,4 +1,4 @@
-.TH "superTornado.WSocketHandler" 3 "Wed Apr 2 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
+.TH "superTornado.WSocketHandler" 3 "Thu Apr 3 2014" "Version 1.0" "MI Protect Privacy" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/m/file/conf b/m/file/conf
index f759add..a551f3b 100644
--- a/m/file/conf
+++ b/m/file/conf
@@ -1,9 +1,13 @@
+# Unhabitant
blind 1
-camera 192.168.1.13
+#Camera
+ipCamera 192.168.1.13
portCamera 80
idUrlCamera test:a
endUrlCamera /image.jpg
-serv 127.0.0.1
+#Serv
+ipServ 127.0.0.1
portServ 80
+#MI
ipDomoMi 127.0.0.1
portDomoMi 8080
diff --git a/m/loadConf.py b/m/loadConf.py
index 2220457..86ade90 100644
--- a/m/loadConf.py
+++ b/m/loadConf.py
@@ -39,7 +39,7 @@ class LoadConf(object):
Return ipCamera configuration
Else "error"
"""
- return self.loadValue("camera")
+ return self.loadValue("ipCamera")
def portCamera(self) :
"""
@@ -53,7 +53,7 @@ class LoadConf(object):
Return ipServ configuration
Else "error"
"""
- return self.loadValue("serv")
+ return self.loadValue("ipServ")
def portServ(self) :
diff --git a/superTornado.py b/superTornado.py
index c55f9b1..a43406f 100644
--- a/superTornado.py
+++ b/superTornado.py
@@ -191,7 +191,9 @@ class WSocketHandler(BaseHandler,tornado.websocket.WebSocketHandler):
else:
GlobalVars.unauthorized + 1
GlobalVars.log.printL('->Send visual alarm unauthorized user',lvl.WARNING)
- self.send_signal_house("/micom/lamp.php?room=salon1&order=1")
+ self.send_signal_house("/micom/lamp.php?room=cuisine1&order=1")
+ if GlobalVars.authorized > 0 :
+ self.send_signal_house("/micom/lamp.php?room=salon1&order=0")
self.send_image()
@@ -226,6 +228,10 @@ class WSocketHandler(BaseHandler,tornado.websocket.WebSocketHandler):
if (GlobalVars.unauthorized == 0) and (GlobalVars.authorized == 0):
GlobalVars.log.printL('->Send Visual Alarm Deconnection User ...',lvl.INFO)
self.send_signal_house("/micom/lamp.php?room=salon1&order=0")
+ self.send_signal_house("/micom/lamp.php?room=cuisine1&order=0")
+ if (GlobalVars.unauthorized == 0) and (GlobalVars.authorized > 0) :
+ self.send_signal_house("/micom/lamp.php?room=salon1&order=1")
+ self.send_signal_house("/micom/lamp.php?room=cuisine1&order=0")
def send_signal_house(self, pRq) :
"""
diff --git a/test/botTest.py b/test/botTest.py
index 9900e32..a01f40b 100644
--- a/test/botTest.py
+++ b/test/botTest.py
@@ -145,7 +145,6 @@ try :
print "Sent"
print "Receiving..."
result = ws.recv()
- print "Rep : " + result
if result == "error":
print "NOK : Response From Socket But Is An Error"
@@ -199,7 +198,6 @@ try :
print "Sent"
print "Receiving..."
result = ws.recv()
- print "Rep : " + result
if result == "error":
print "NOK : Response From Socket But Is An Error"