wip

software/simpleran/buildout.hash.cfg

@@ -60,7 +60,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 492b50aad5bd9be834091eca1dfb0149
+md5sum = fa995821a22f0da6a2217ceb9a0a1948
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = 5b046b0bd0f4b9b604a8ba947ae86417
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = a3ac50df13ddb723efdc97bf90185c0e
+md5sum = 0873c504a564d0fe6fbd0483a8f04c05
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

software/simpleran/config/enb.jinja2.cfg

@@ -143,13 +143,13 @@
 #}
 {#- start of the config -#}
 {
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,bcch=1
 {%- if slapparameter_dict.get('log_phy_debug', False) -%}
     phy.level=debug
 {%- else -%}
-    phy.level=info
+    phy.level=debug
 {%- endif -%}
-    ,file.rotate=200M",
+    ,file.rotate=100K",
   log_filename: "{{ directory['log'] }}/enb.log",
 {#- 
 

software/simpleran/instance-enb.jinja2.cfg

@@ -136,6 +136,12 @@ output = ${directory:bin}/${:_buildout_section_name_}
 enb-info-log = ${directory:log}/enb-info.log
 enb-radio-log = ${directory:log}/enb.log
 enb-start-date = ${directory:run}/enb-start.date
+#max-enb-radio-log-combined-size = 5000 5000
+#max-enb-info-log-combined-size  = 1000000
+#max-enb-info-log-size           = 100000
+max-enb-radio-log-combined-kb-size = 400
+max-enb-info-log-combined-kb-size  = 50
+max-enb-info-log-kb-size           = 20
 inline =
   #!/bin/sh
   # Amarisoft init scripts
@@ -153,14 +159,14 @@ inline =
   rm -f ${directory:log}/enb-output.log
   # Archive current log 
   stat ${:enb-start-date} && mv ${:enb-radio-log} ${:enb-radio-log}.$(cat ${:enb-start-date})
-  # Split enb info log into 500k chunks
-  if test $(du ${:enb-info-log} | cut -f1) -ge 100000 ; then
+  # Split enb info log into smaller chunks
+  if test $(du ${:enb-info-log} | cut -f1) -ge ${:max-enb-info-log-kb-size} ; then
     stat ${:enb-start-date} || date +"%Y%m%d.%T" > ${:enb-start-date}
-    head -c -500k ${:enb-info-log} > ${:enb-info-log}.$(cat ${:enb-start-date})
-    tail -c 500k ${:enb-info-log} > ${:enb-info-log}.tmp
+    head -c -$((${:max-enb-info-log-kb-size}/2))k ${:enb-info-log} > ${:enb-info-log}.$(cat ${:enb-start-date})
+    tail -c $((${:-max-enb-info-log-kb-size}/2))k ${:enb-info-log} > ${:enb-info-log}.tmp
     mv ${:enb-info-log}.tmp ${:enb-info-log}
   fi
-  # Keep only 5Gb for radio logs and 1Gb for eNB info log
+  # Limit combined size for enb radio archive logs and enb info archive logs
   trim() {
     i=-1
     N=$(ls -1t $2* | wc -l)
@@ -171,8 +177,8 @@ inline =
     done
     rm -f $(ls -1t $2* | tail -n$i)
   }
-  trim 5000000 ${:enb-radio-log}.
-  trim 1000000 ${:enb-info-log}.
+  trim ${:max-enb-radio-log-combined-kb-size} ${:enb-radio-log}.
+  trim ${:enb-info-log-combined-kb-size}      ${:enb-info-log}.
   # Remove almost empty enb radio archive log files
   rm -f $(find $(dirname ${:enb-radio-log}) -name "$(basename ${:enb-radio-log}).*" -size -5k)
   # Launch lteenb