diff --git a/inc/lweb_file_cache.pbi b/inc/lweb_file_cache.pbi
index 53e337d..2f64d07 100644
--- a/inc/lweb_file_cache.pbi
+++ b/inc/lweb_file_cache.pbi
@@ -19,10 +19,10 @@ Procedure FileCacheCleaner(Information.i)
configuration\cache\current - m_file_cache(MapKey(m_file_cache_map()))\Size
FreeMemory(m_file_cache(MapKey(m_file_cache_map()))\Buffer)
DeleteMapElement(m_file_cache(), MapKey(m_file_cache_map()))
- Debug "Info:["+Str(innercount)+"] Killed:["+MapKey(m_file_cache_map())+"]"
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "Info:["+Str(innercount)+"] Killed:["+MapKey(m_file_cache_map())+"]")
Selected = DeleteMapElement(m_file_cache_map())
Else
- Debug "Info:["+Str(innercount)+"] Could Not kill:["+MapKey(m_file_cache_map())+"]"
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "Info:["+Str(innercount)+"] Could Not kill:["+MapKey(m_file_cache_map())+"]")
EndIf
Else
Selected = NextMapElement(m_file_cache_map())
@@ -46,7 +46,7 @@ Procedure FileCache(Information.i)
Repeat
WaitSemaphore(file_cache_semaphore)
- Debug "Adresse:"+m_file_cache()\Buffer
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "Adresse:"+m_file_cache()\Buffer)
If (m_file_cache()\Size + configuration\cache\current) <= MaxSize
configuration\cache\current + m_file_cache()\Size
Tempbuffer = AllocateMemory(m_file_cache()\Size)
@@ -57,7 +57,7 @@ Procedure FileCache(Information.i)
m_file_cache_map(MapKey(m_file_cache())) = #True
SignalSemaphore(file_cache_semaphore_thread)
Else
- Debug "Cache Full"
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "Cache Full")
SignalSemaphore(file_cache_semaphore_thread)
EndIf
@@ -66,15 +66,15 @@ EndProcedure
Procedure AddFileToCache(MemoryID.i, FileName.s, Size.i)
LockMutex(file_cache_mutex)
- Debug "Cache MaxSize:"+Str(configuration\cache\maxsize*1024*1024)+" Actual Size:"+Str(configuration\cache\current)
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "Cache MaxSize:"+Str(configuration\cache\maxsize*1024*1024)+" Actual Size:"+Str(configuration\cache\current))
m_file_cache(FileName)\Buffer = MemoryID
m_file_cache(FileName)\Size = Size
SignalSemaphore(file_cache_semaphore)
WaitSemaphore(file_cache_semaphore_thread)
If m_file_cache(FileName)\Is
- Debug FileName+" Size:"+Str(m_file_cache(FileName)\Size)+" Timer:"+Str(m_file_cache(FileName)\Timer)+ " new Memory ID:"+Str(m_file_cache(FileName)\Buffer)
+ lhs_log_ext::Out(configuration\log\CachelogUUID, FileName+" Size:"+Str(m_file_cache(FileName)\Size)+" Timer:"+Str(m_file_cache(FileName)\Timer)+ " new Memory ID:"+Str(m_file_cache(FileName)\Buffer))
Else
- Debug "File not in cache was to full:"+FileName+ " MaxSize:"+Str(configuration\cache\maxsize)+" Actual Size:"+Str(configuration\cache\current/1024/1024)
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "File not in cache was to full:"+FileName+ " MaxSize:"+Str(configuration\cache\maxsize)+" Actual Size:"+Str(configuration\cache\current/1024/1024))
EndIf
UnlockMutex(file_cache_mutex)
@@ -92,7 +92,10 @@ Procedure.s GetFileFromCache(FileName.s, MemoryID.i)
String.s = #error_string
EndIf
UnlockMutex(file_cache_mutex)
- Debug "Get from cache: "+FileName+">"+String+"-------------------------------------------------------------<"
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "File from Cache:"+FileName)
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "Content: --------------------------------------------------------")
+ lhs_log_ext::Out(configuration\log\CachelogUUID, String)
+ lhs_log_ext::Out(configuration\log\CachelogUUID, "End Content. ----------------------------------------------------")
ProcedureReturn String.s
Else
ProcedureReturn #error_string
diff --git a/lweb.pbi b/lweb.pbi
index 5a723b4..5ce7595 100644
--- a/lweb.pbi
+++ b/lweb.pbi
@@ -54,6 +54,8 @@ Module lhs_web
AccesslogUUID.s
Errorlog.s
ErrorlogUUID.s
+ Cachelog.s
+ CachelogUUID.s
EndStructure
Structure server
@@ -254,6 +256,8 @@ Module lhs_web
configuration\log\AccesslogUUID = setting
Case #conf_Error_logUUID
configuration\log\ErrorlogUUID = setting
+ Case #conf_Cache_logUUID
+ configuration\log\CachelogUUID = setting
Case #conf_debug_logfile
configuration\log\Debuglog = setting
Case #conf_debug_disable
diff --git a/lweb.pbp b/lweb.pbp
index c17b398..ecfe4e6 100644
--- a/lweb.pbp
+++ b/lweb.pbp
@@ -8,7 +8,7 @@
@@ -44,36 +44,36 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/lweb_header.pbi b/lweb_header.pbi
index 8812988..1980594 100644
--- a/lweb_header.pbi
+++ b/lweb_header.pbi
@@ -45,6 +45,8 @@ DeclareModule lhs_web
#conf_Access_logUUID
#conf_Error_logfile
#conf_Error_logUUID
+ #conf_Cache_logfile
+ #conf_Cache_logUUID
#conf_runfile
EndEnumeration
diff --git a/server_example.pb b/server_example.pb
index 9695daf..b96005e 100644
--- a/server_example.pb
+++ b/server_example.pb
@@ -24,7 +24,7 @@ XIncludeFile "lweb.pbi"
;*
Define counter, v_lweb_srv_stop
-Define Accesslog.s, Errorlog.s
+Define Accesslog.s, Errorlog.s, Cachelog.s
;*
;* Basic Debug Log initialization:
@@ -42,16 +42,19 @@ lhs_log::Init()
;*
Accesslog = lhs_log_ext::Create("Accesslog")
Errorlog = lhs_log_ext::Create("Errorlog")
+Cachelog = lhs_log_ext::Create("Cachelog")
lhs_log::Out("Errorlog UUID:"+Errorlog)
lhs_log::Out("Accesslog UUID:"+Accesslog)
+lhs_log::Out("Cachelog UUID:"+Cachelog)
lhs_log_ext::SetLogFile(Accesslog, "http-s_access.log")
lhs_log_ext::SetLogFile(Errorlog, "http-s_error.log")
+lhs_log_ext::SetLogFile(Cachelog, "http-s_cache.log")
lhs_log_ext::Init(Accesslog)
lhs_log_ext::Init(Errorlog)
-
-lhs_web::set_config(lhs_web::#conf_log_Accesslog, Accesslog)
-lhs_web::set_config(lhs_web::#conf_log_Errorlog, ErrorLog)
-
+lhs_log_ext::Init(Cachelog)
+lhs_web::set_config(lhs_web::#conf_Access_logUUID, Accesslog)
+lhs_web::set_config(lhs_web::#conf_Error_logUUID, ErrorLog)
+lhs_web::set_config(lhs_web::#conf_Cache_logUUID, Cachelog)
lhs_web::set_config(lhs_web::#conf_HTTP_port, "8084")
;lhs_web::set_config(lhs_web::#conf_binding, "127.0.0.1")
lhs_web::set_config(lhs_web::#conf_HTTP_binding, "0.0.0.0")