Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package logfilegen for openSUSE:Factory checked in at 2023-04-10 20:34:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/logfilegen (Old) and /work/SRC/openSUSE:Factory/.logfilegen.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "logfilegen" Mon Apr 10 20:34:26 2023 rev:11 rq:1078261 version:3.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/logfilegen/logfilegen.changes 2023-04-09 18:43:27.702581280 +0200 +++ /work/SRC/openSUSE:Factory/.logfilegen.new.19717/logfilegen.changes 2023-04-10 20:34:26.711084199 +0200 @@ -1,0 +2,6 @@ +Mon Apr 10 13:51:49 UTC 2023 - Andreas Stieger <[email protected]> + +- logfilegen 3.0.2: + * seq macro fix, including a syntax change + +------------------------------------------------------------------- Old: ---- logfilegen-3.0.1.tar.gz New: ---- logfilegen-3.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logfilegen.spec ++++++ --- /var/tmp/diff_new_pack.IY9uKT/_old 2023-04-10 20:34:27.151086772 +0200 +++ /var/tmp/diff_new_pack.IY9uKT/_new 2023-04-10 20:34:27.155086795 +0200 @@ -18,7 +18,7 @@ Name: logfilegen -Version: 3.0.1 +Version: 3.0.2 Release: 0 Summary: Log file generator for server log files and user-defined formats License: Unlicense ++++++ logfilegen-3.0.1.tar.gz -> logfilegen-3.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logfilegen-3.0.1/CMakeLists.txt new/logfilegen-3.0.2/CMakeLists.txt --- old/logfilegen-3.0.1/CMakeLists.txt 2023-04-09 11:30:15.000000000 +0200 +++ new/logfilegen-3.0.2/CMakeLists.txt 2023-04-10 10:53:29.000000000 +0200 @@ -13,7 +13,7 @@ endif(USE_CLANG) -project (logfilegen VERSION 3.0.1 LANGUAGES CXX) +project (logfilegen VERSION 3.0.2 LANGUAGES CXX) add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logfilegen-3.0.1/ChangeLog new/logfilegen-3.0.2/ChangeLog --- old/logfilegen-3.0.1/ChangeLog 2023-04-09 11:30:15.000000000 +0200 +++ new/logfilegen-3.0.2/ChangeLog 2023-04-10 10:53:29.000000000 +0200 @@ -1,3 +1,8 @@ +3.0.2 +* @seq macros fix. Syntax change! +Was: @seq:param1:param2:etc +Now: @seq:param1|param2|etc + 3.0.1 * @meta fix * randomizer rewrote diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logfilegen-3.0.1/NEWS new/logfilegen-3.0.2/NEWS --- old/logfilegen-3.0.1/NEWS 2023-04-09 11:30:15.000000000 +0200 +++ new/logfilegen-3.0.2/NEWS 2023-04-10 10:53:29.000000000 +0200 @@ -5,3 +5,7 @@ upd 3.0.1 * @meta macro fixes * randomizer code has been rewritten +upd 3.0.2 +* @seq macros fix. Syntax change! +Was: @seq:param1:param2:etc +Now: @seq:param1|param2|etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logfilegen-3.0.1/docs/templates.md new/logfilegen-3.0.2/docs/templates.md --- old/logfilegen-3.0.1/docs/templates.md 2023-04-09 11:30:15.000000000 +0200 +++ new/logfilegen-3.0.2/docs/templates.md 2023-04-10 10:53:29.000000000 +0200 @@ -267,14 +267,14 @@ #### @seq -Works like **sequence** variable values. Each value is separated by ```:```. +Works like **sequence** variable values. Each value is separated by ```|```. -Syntax: ```@seq:param1:param2:etc``` +Syntax: ```@seq:param1|param2|etc``` Example: ``` -$test=@seq:GET:PUT +$test=@seq:GET|PUT $logstring=hello, $test ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logfilegen-3.0.1/macro.cpp new/logfilegen-3.0.2/macro.cpp --- old/logfilegen-3.0.1/macro.cpp 2023-04-09 11:30:15.000000000 +0200 +++ new/logfilegen-3.0.2/macro.cpp 2023-04-10 10:53:29.000000000 +0200 @@ -495,10 +495,24 @@ length = 0; text = ""; + size_t pos = s.find_first_of ("|"); + if (pos == std::string::npos) + return; + + // vt = split_string_to_vector_a (s, ':', '/'); - vt = split_string_to_vector (s, ":"); + pos = s.find_first_of (":"); + if (pos == std::string::npos) + return; + + std::string t = s.substr (pos); + // cout << "t: " << t << endl; + + vt = split_string_to_vector (t, "|"); + +// vt = split_string_to_vector (s, ":"); } @@ -508,6 +522,9 @@ //cout << "vt.size(): " << vt.size() << endl; + if (vt.size() == 0) + return string(); + size_t i = get_rnd (1, vt.size() - 1); // cout << "CMacroSeq::process() 2:" << i << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logfilegen-3.0.1/main.cpp new/logfilegen-3.0.2/main.cpp --- old/logfilegen-3.0.1/main.cpp 2023-04-09 11:30:15.000000000 +0200 +++ new/logfilegen-3.0.2/main.cpp 2023-04-10 10:53:29.000000000 +0200 @@ -41,7 +41,7 @@ #ifndef VERSION_NUMBER -#define VERSION_NUMBER "3.0.1" +#define VERSION_NUMBER "3.0.2" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logfilegen-3.0.1/tpl.cpp new/logfilegen-3.0.2/tpl.cpp --- old/logfilegen-3.0.1/tpl.cpp 2023-04-09 11:30:15.000000000 +0200 +++ new/logfilegen-3.0.2/tpl.cpp 2023-04-10 10:53:29.000000000 +0200 @@ -88,7 +88,7 @@ vars.insert (std::make_pair ("%t", new CVar ("%t", "@datetime:%d/%b/%Y:%H:%M:%S %z"))); //$request $uri $protocol - vars.insert (std::make_pair ("%r", new CVar ("%r", "@meta:(@seq:/GET:/PUT) (@path:1:5:3) (@seq:HTTP/1.1:/HTTP/2.0)"))); + vars.insert (std::make_pair ("%r", new CVar ("%r", "@meta:(@seq:/GET|/PUT) (@path:1:5:3) (@seq:HTTP/1.1|/HTTP/2.0)"))); vars.insert (std::make_pair ("%>s", new CVar ("%>s", "200|400"))); vars.insert (std::make_pair ("%b", new CVar ("%b", "1..9999")));
