X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FLog.cc;h=da7985d60115bff1bde22cc9557131f7059c6742;hp=2ea6c57533875b808c58c01e97e3a6205fd12737;hb=8c6a82feb045ac859b344cd7665a36ac00f4949e;hpb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e

diff --git a/src/Moof/Log.cc b/src/Moof/Log.cc
index 2ea6c57..da7985d 100644
--- a/src/Moof/Log.cc
+++ b/src/Moof/Log.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include <fstream>
 
@@ -35,40 +18,39 @@
 namespace Mf {
 
 
-Log::Level Log::gLevel = Log::WARNING;
+Log::Level Log::gLevel = Log::INFO;
 
 
 void Log::setLevel(Level level)
 {
-	if (level != 0) gLevel = level;
+	gLevel = level;
 }
 
-Log::Level Log::getLevel()
+Log::Level Log::level()
 {
 	return gLevel;
 }
 
 
-static std::ofstream nullLog_;
-
 std::ostream& log(std::clog);
+
+static std::ofstream nullLog_;
 std::ostream& nullLog(nullLog_);
 
-Log logError(Log::ERRORR, "  error: ");
+Log logError(  Log::ERRORR,  "  error: ");
 Log logWarning(Log::WARNING, "warning: ");
-Log logInfo(Log::INFO, "   info: ");
-Log logDebug(Log::DEBUGG, "  debug: ");
+Log logInfo(   Log::INFO,    "   info: ");
 
 
-static int logScript_(Script& script)
+static int logScript_(Script& script, Log::Level level)
 {
-	static Log logScript(Log::SCRIPT, " script: ");
+	static Log* logs[] = {0, &logError, &logWarning, &logInfo};
 
 	Script::Slot param = script[1];
 
 	while (!param.isNone())
 	{
-		logScript(param);
+		(*logs[level])(param);
 		++param.index;
 	}
 
@@ -76,9 +58,16 @@ static int logScript_(Script& script)
 }
 
 
-void importLogPrintFunction(Script& script)
+void importLogFunctions(Script& script)
 {
-	script.importFunction("print", logScript_);
+	script.importFunction("LogError",
+						  boost::bind(logScript_, _1, Log::ERRORR));
+	script.importFunction("LogWarning",
+						  boost::bind(logScript_, _1, Log::WARNING));
+	script.importFunction("LogInfo",
+						  boost::bind(logScript_, _1, Log::INFO));
+	script.importFunction("print",
+						  boost::bind(logScript_, _1, Log::INFO));
 }