[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [2937] Updated plugins with new logManager, and added
|
From: |
Daniele Perrone |
|
Subject: |
[myserver-commit] [2937] Updated plugins with new logManager, and added version informations in xml descriptors |
|
Date: |
Thu, 06 Nov 2008 20:42:01 +0000 |
Revision: 2937
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2937
Author: dperrone
Date: 2008-11-06 20:42:00 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Updated plugins with new logManager, and added version informations in xml
descriptors
Modified Paths:
--------------
trunk/plugins/src/http_checker/http_checker.cpp
trunk/plugins/src/http_checker/plugin.xml
trunk/plugins/src/python/plugin.xml
trunk/plugins/src/python/python.cpp
trunk/plugins/src/python_http_handler/plugin.xml
trunk/plugins/src/python_http_handler/python_http_handler.cpp
trunk/plugins/src/rules_checker/plugin.xml
trunk/plugins/src/rules_checker/rules_checker.cpp
Modified: trunk/plugins/src/http_checker/http_checker.cpp
===================================================================
--- trunk/plugins/src/http_checker/http_checker.cpp 2008-11-04 21:29:18 UTC
(rev 2936)
+++ trunk/plugins/src/http_checker/http_checker.cpp 2008-11-06 20:42:00 UTC
(rev 2937)
@@ -238,22 +238,14 @@
xmlDocPtr xmlDoc;
if(!staticData)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("HttpChecker: Invalid HTTP static
data");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
python = serverInstance->getPluginsManager()->getPlugin(pythonName);
if(!python)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("HttpChecker: Cannot find
executors::python");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
observer.setPythonExecutor(python);
@@ -264,11 +256,7 @@
if(!init)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("HttpChecker: Cannot find method
initModule in executors::python");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
configuration = serverInstance->getConfiguration();
@@ -298,11 +286,7 @@
if(!data)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("HttpChecker:
Invalid rule");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
Modified: trunk/plugins/src/http_checker/plugin.xml
===================================================================
--- trunk/plugins/src/http_checker/plugin.xml 2008-11-04 21:29:18 UTC (rev
2936)
+++ trunk/plugins/src/http_checker/plugin.xml 2008-11-06 20:42:00 UTC (rev
2937)
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
-<PLUGIN>
+<PLUGIN min-version="0.9" max-version="0.9">
<NAME>http_checker</NAME>
<VERSION>0.1</VERSION>
<AUTHOR>The Free Software Foundation Inc.</AUTHOR>
<MAINTAINER>The Free Software Foundation Inc.</MAINTAINER>
<DESCRIPTION>This plugin permits to validate HTTP requests using
python</DESCRIPTION>
-<DEPENDS>python</DEPENDS>
+<DEPENDS min-version="0.1" max-version="0.1">python</DEPENDS>
</PLUGIN>
Modified: trunk/plugins/src/python/plugin.xml
===================================================================
--- trunk/plugins/src/python/plugin.xml 2008-11-04 21:29:18 UTC (rev 2936)
+++ trunk/plugins/src/python/plugin.xml 2008-11-06 20:42:00 UTC (rev 2937)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<PLUGIN>
+<PLUGIN min-version="0.9" max-version="0.9">
<NAME>python</NAME>
<VERSION>0.1</VERSION>
<AUTHOR>The MyServer Team</AUTHOR>
Modified: trunk/plugins/src/python/python.cpp
===================================================================
--- trunk/plugins/src/python/python.cpp 2008-11-04 21:29:18 UTC (rev 2936)
+++ trunk/plugins/src/python/python.cpp 2008-11-06 20:42:00 UTC (rev 2937)
@@ -206,12 +206,10 @@
msg.assign ("Python: Cannot load file ");
msg.append (filename);
- serverInstance->logLockAccess ();
- serverInstance->logPreparePrintError ();
+
serverInstance->logWriteln (msg.c_str ());
- serverInstance->logEndPrintError ();
- serverInstance->logUnlockAccess ();
+
ret = -1;
}
else
Modified: trunk/plugins/src/python_http_handler/plugin.xml
===================================================================
--- trunk/plugins/src/python_http_handler/plugin.xml 2008-11-04 21:29:18 UTC
(rev 2936)
+++ trunk/plugins/src/python_http_handler/plugin.xml 2008-11-06 20:42:00 UTC
(rev 2937)
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
-<PLUGIN>
+<PLUGIN min-version="0.9" max-version="0.9">
<NAME>python_http_handler</NAME>
<VERSION>0.1</VERSION>
<AUTHOR>The Free Software Foundation Inc.</AUTHOR>
<MAINTAINER>The Free Software Foundation Inc.</MAINTAINER>
<DESCRIPTION>This plugin permits to use python as handler</DESCRIPTION>
-<DEPENDS>python</DEPENDS>
+<DEPENDS min-version="0.1" max-version="0.1">python</DEPENDS>
</PLUGIN>
Modified: trunk/plugins/src/python_http_handler/python_http_handler.cpp
===================================================================
--- trunk/plugins/src/python_http_handler/python_http_handler.cpp
2008-11-04 21:29:18 UTC (rev 2936)
+++ trunk/plugins/src/python_http_handler/python_http_handler.cpp
2008-11-06 20:42:00 UTC (rev 2937)
@@ -164,11 +164,7 @@
if (!PyArg_ParseTuple(args, (char*)"s", &msg))
return NULL;
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln(msg);
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return NULL;
}
@@ -417,22 +413,14 @@
xmlDocPtr xmlDoc;
if(!staticData)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("PythonHttpHandler: Invalid HTTP
static data");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
python = serverInstance->getPluginsManager()->getPlugin(pythonName);
if(!python)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("PythonHttpHandler: Cannot find
executors::python");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
observer.setPythonExecutor(python);
@@ -443,11 +431,7 @@
if(!init)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("PythonHttpHandler: Cannot find
method initModule in executors::python");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
configuration = serverInstance->getConfiguration();
@@ -477,11 +461,7 @@
if(!data)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("PythonHttpHandler:
Invalid rule");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
Modified: trunk/plugins/src/rules_checker/plugin.xml
===================================================================
--- trunk/plugins/src/rules_checker/plugin.xml 2008-11-04 21:29:18 UTC (rev
2936)
+++ trunk/plugins/src/rules_checker/plugin.xml 2008-11-06 20:42:00 UTC (rev
2937)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<PLUGIN>
+<PLUGIN min-version="0.9" max-version="0.9">
<NAME>rules_checker</NAME>
<VERSION>0.1</VERSION>
<AUTHOR>The Free Software Foundation Inc.</AUTHOR>
Modified: trunk/plugins/src/rules_checker/rules_checker.cpp
===================================================================
--- trunk/plugins/src/rules_checker/rules_checker.cpp 2008-11-04 21:29:18 UTC
(rev 2936)
+++ trunk/plugins/src/rules_checker/rules_checker.cpp 2008-11-06 20:42:00 UTC
(rev 2937)
@@ -102,11 +102,7 @@
xmlDocPtr xmlDoc;
if(!staticData)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("RulesChecker: Invalid HTTP static
data");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
@@ -127,11 +123,7 @@
if(!data)
{
- serverInstance->logLockAccess();
- serverInstance->logPreparePrintError();
serverInstance->logWriteln("RulesChecker:
Invalid rule");
- serverInstance->logEndPrintError();
- serverInstance->logUnlockAccess();
return -1;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [2937] Updated plugins with new logManager, and added version informations in xml descriptors,
Daniele Perrone <=