up

kbengine · kbengine · commit d10dba8bae3e · 2014-08-15T17:57:17.000+08:00
diff --git a/kbe/src/lib/pyscript/pyprofile_handler.cpp b/kbe/src/lib/pyscript/pyprofile_handler.cpp
@@ -45,20 +45,23 @@ ProfileHandler(networkInterface, timinglen, name, addr)
 //-------------------------------------------------------------------------------------
 PyProfileHandler::~PyProfileHandler()
 {
-	if(name_ != "kbengine" || !g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile)
+	if(name_ != "kbengine" || !(g_componentType == BASEAPP_TYPE ? g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile : 
+		g_kbeSrvConfig.getCellApp().profiles.open_pyprofile))
 		script::PyProfile::remove(name_);
 }
 
 //-------------------------------------------------------------------------------------
 void PyProfileHandler::timeout()
 {
-	if(name_ != "kbengine" || !g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile)
+	if(name_ != "kbengine" || !(g_componentType == BASEAPP_TYPE ? g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile : 
+		g_kbeSrvConfig.getCellApp().profiles.open_pyprofile))
 		script::PyProfile::stop(name_);
 
 	MemoryStream s;
 	script::PyProfile::addToStream(name_, &s);
 
-	if(name_ == "kbengine" && g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile)
+	if(name_ == "kbengine" && (g_componentType == BASEAPP_TYPE ? g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile : 
+		g_kbeSrvConfig.getCellApp().profiles.open_pyprofile))
 		script::PyProfile::start(name_);
 	
 	sendStream(&s);
diff --git a/kbe/src/server/cellapp/cellapp.cpp b/kbe/src/server/cellapp/cellapp.cpp
@@ -234,7 +234,7 @@ bool Cellapp::initializeEnd()
 {
 	// �����Ҫpyprofile���ڴ˴���װ
 	// ����ʱж�ز�������
-	if(g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile)
+	if(g_kbeSrvConfig.getCellApp().profiles.open_pyprofile)
 	{
 		script::PyProfile::start("kbengine");
 	}

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ bool Cellapp::initializeEnd()`
`234`	`234`	`{`
`235`	`235`	`// 如果需要pyprofile则在此处安装`
`236`	`236`	`// 结束时卸载并输出结果`
`237`		`- if(g_kbeSrvConfig.getBaseApp().profiles.open_pyprofile)`
	`237`	`+ if(g_kbeSrvConfig.getCellApp().profiles.open_pyprofile)`
`238`	`238`	`{`
`239`	`239`	`script::PyProfile::start("kbengine");`
`240`	`240`	`}`