As far as this thread is concerned, if replace and wrap tests pass, I think it must be all.
-- Regards, Janmejay PS: Please blame the typos in this mail on my phone's uncivilized soft keyboard sporting it's not-so-smart-assist technology. On Nov 6, 2014 6:55 PM, "Rainer Gerhards" <[email protected]> wrote: > 2014-11-06 14:11 GMT+01:00 singh.janmejay <[email protected]>: > > > Im sure of having run it(checked the output log file), but I guess I may > > have folded the fix in a different patch. My bad. > > > > > no problem, was an easy fix. I just wanted to warn you. Also, just to be > clear: I think everything I got from you is now merged. Or anything > missing? > > Rainer > > > > On Thu, Nov 6, 2014 at 6:28 PM, Rainer Gerhards < > [email protected]> > > wrote: > > > > > 2014-11-05 10:15 GMT+01:00 Rainer Gerhards <[email protected]>: > > > > > > > thanks for the patches, I have now merged them. > > > > > > > > > > > Note that there was a broken test. The testbench caught it this > morning. > > > Fix is already applied: > > > > > > > > > > > > https://github.com/rsyslog/rsyslog/commit/06fc0a6b6ba680eb2771c9e78de563acbb0bad13 > > > > > > However, it looks like this test was never executed in your > environment - > > > it could never have been completed successfully. I suggest to check > your > > > settings. > > > > > > Rainer > > > > > > Rainer > > > > > > > > 2014-11-03 8:24 GMT+01:00 singh.janmejay <[email protected]>: > > > > > > > > Killed some helping debug some test code (it was meant to copy file > to > > > /tmp > > > >> so it would survive diag.sh exit). Goes after the replace/wrap tests > > > >> patch. > > > >> > > > >> On Mon, Nov 3, 2014 at 12:08 PM, singh.janmejay < > > > [email protected] > > > >> > > > > >> wrote: > > > >> > > > >> > Tests for replace, wrap(2) and wrap(3) + a bug-fix in replace. > > > >> > > > > >> > Sorry for the passing more patches, Im using patches/mail to > > complete > > > >> > things that are half-done, will start using github fork to manage > > > fresh > > > >> > work. Last patch, I guess. > > > >> > > > > >> > On Fri, Oct 31, 2014 at 7:31 AM, singh.janmejay < > > > >> [email protected]> > > > >> > wrote: > > > >> > > > > >> >> > > > >> >> > > > >> >> On Thu, Oct 30, 2014 at 5:00 PM, Rainer Gerhards < > > > >> >> [email protected]> wrote: > > > >> >> > > > >> >>> 014-10-30 12:28 GMT+01:00 singh.janmejay < > > [email protected] > > > >: > > > >> >>> > > > >> >>> > Patch for rsyslog-doc. > > > >> >>> > > > > >> >>> > > > > >> >>> Thanks! > > > >> >>> > > > >> >>> > > > >> >>> > I coudn't find the repo on git.adiscon.com, so this patch is > > done > > > >> >>> over the > > > >> >>> > github mirror. > > > >> >>> > > > > >> >>> > > > > >> >>> This repo only exists on github. In any case, github is more or > > less > > > >> the > > > >> >>> primary these days, because it's easier to work with their pull > > > >> requests. > > > >> >>> > > > >> >>> Will merge within the next couple of minutes (so no extra > > > confirmation > > > >> >>> for > > > >> >>> that ;)). > > > >> >>> > > > >> >>> Rainer > > > >> >>> > > > >> >>> > On Wed, Oct 29, 2014 at 8:33 PM, singh.janmejay < > > > >> >>> [email protected]> > > > >> >>> > wrote: > > > >> >>> > > > > >> >>> > > Sure. > > > >> >>> > > > > > >> >>> > > -- > > > >> >>> > > Regards, > > > >> >>> > > Janmejay > > > >> >>> > > > > > >> >>> > > PS: Please blame the typos in this mail on my phone's > > > uncivilized > > > >> >>> soft > > > >> >>> > > keyboard sporting it's not-so-smart-assist technology. > > > >> >>> > > > > > >> >>> > > On Oct 29, 2014 8:31 PM, "Rainer Gerhards" < > > > >> [email protected] > > > >> >>> > > > > >> >>> > > wrote: > > > >> >>> > > > > > >> >>> > >> excellent, thx! If you need help, let me know. > > > >> >>> > >> > > > >> >>> > >> Rainer > > > >> >>> > >> > > > >> >>> > >> 2014-10-29 16:00 GMT+01:00 singh.janmejay < > > > >> [email protected] > > > >> >>> >: > > > >> >>> > >> > > > >> >>> > >> > No, I'll add docs, I want to learn how to do it. Let me > > > handle > > > >> it. > > > >> >>> > >> > > > > >> >>> > >> > -- > > > >> >>> > >> > Regards, > > > >> >>> > >> > Janmejay > > > >> >>> > >> > > > > >> >>> > >> > PS: Please blame the typos in this mail on my phone's > > > >> uncivilized > > > >> >>> soft > > > >> >>> > >> > keyboard sporting it's not-so-smart-assist technology. > > > >> >>> > >> > > > > >> >>> > >> > On Oct 29, 2014 7:30 PM, "Rainer Gerhards" < > > > >> >>> [email protected]> > > > >> >>> > >> > wrote: > > > >> >>> > >> > > > > >> >>> > >> > > Looks fine to me, except for a minor code formatting > nit > > > (we > > > >> >>> use tab > > > >> >>> > >> and > > > >> >>> > >> > > not fixed spaces - bad choice at that time ;)). > > > >> >>> > >> > > > > > >> >>> > >> > > I have now also merged these two. > > > >> >>> > >> > > > > > >> >>> > >> > > It would be great if you could add some doc to the > > > >> rsyslog-doc > > > >> >>> > >> project. > > > >> >>> > >> > If > > > >> >>> > >> > > there is no time, let me know and I'll at least mention > > the > > > >> new > > > >> >>> > >> functions > > > >> >>> > >> > > in it. > > > >> >>> > >> > > > > > >> >>> > >> > > Thanks again! > > > >> >>> > >> > > Rainer > > > >> >>> > >> > > > > > >> >>> > >> > > 2014-10-21 9:38 GMT+02:00 singh.janmejay < > > > >> >>> [email protected] > > > >> >>> > >: > > > >> >>> > >> > > > > > >> >>> > >> > > > Hi Rainer, David, > > > >> >>> > >> > > > > > > >> >>> > >> > > > Do the patches look ok? > > > >> >>> > >> > > > > > > >> >>> > >> > > > On Fri, Oct 17, 2014 at 3:56 PM, singh.janmejay < > > > >> >>> > >> > > [email protected]> > > > >> >>> > >> > > > wrote: > > > >> >>> > >> > > > > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > On Tue, Oct 14, 2014 at 12:18 PM, singh.janmejay < > > > >> >>> > >> > > > [email protected] > > > >> >>> > >> > > > > > wrote: > > > >> >>> > >> > > > > > > > >> >>> > >> > > > >> Yes, I'll make necessary changes and send the > patch > > > >> again. > > > >> >>> > >> > > > >> > > > >> >>> > >> > > > >> -- > > > >> >>> > >> > > > >> Regards, > > > >> >>> > >> > > > >> Janmejay > > > >> >>> > >> > > > >> > > > >> >>> > >> > > > >> PS: Please blame the typos in this mail on my > > phone's > > > >> >>> > uncivilized > > > >> >>> > >> > soft > > > >> >>> > >> > > > >> keyboard sporting it's not-so-smart-assist > > technology. > > > >> >>> > >> > > > >> On Oct 14, 2014 12:02 PM, "Rainer Gerhards" < > > > >> >>> > >> > > [email protected]> > > > >> >>> > >> > > > >> wrote: > > > >> >>> > >> > > > >> > > > >> >>> > >> > > > >>> 2014-10-14 8:30 GMT+02:00 singh.janmejay < > > > >> >>> > >> [email protected] > > > >> >>> > >> > >: > > > >> >>> > >> > > > >>> > > > >> >>> > >> > > > >>> > > > - replace(operand, > substring_to_be_replaced, > > > >> >>> > >> its_replacement) > > > >> >>> > >> > > > >>> > > > - wrap(operand, string_to_wrap_around_it) > > > >> >>> > >> > > > >>> > > > > > > >> >>> > >> > > > >>> > > > > > >> >>> > >> > > > >>> > > - concat(operand_1, operand_2) > > > >> >>> > >> > > > >>> > > > > > > >> >>> > >> > > > >>> > > > > > >> >>> > >> > > > >>> > > > > > >> >>> > >> > > > >>> > > I think you overlooked the concatenation > > > operation. > > > >> >>> you > > > >> >>> > can > > > >> >>> > >> > > simply > > > >> >>> > >> > > > do > > > >> >>> > >> > > > >>> > > > > > >> >>> > >> > > > >>> > > operand1 & operand2 > > > >> >>> > >> > > > >>> > > > > > >> >>> > >> > > > >>> > > eg: "foo" & "bar" ==> "foobar" > > > >> >>> > >> > > > >>> > > > > > >> >>> > >> > > > >>> > > I think concat() is equivalent to this. Am I > > > right? > > > >> >>> > >> > > > >>> > > > > > >> >>> > >> > > > >>> > > > > >> >>> > >> > > > >>> > It is the same. I didn't know it was available > as > > > an > > > >> >>> > >> operator, my > > > >> >>> > >> > > > bad. > > > >> >>> > >> > > > >>> Will > > > >> >>> > >> > > > >>> > remove the concat implementation in the > reworked > > > >> patch. > > > >> >>> > >> > > > >>> > > > > >> >>> > >> > > > >>> > > > >> >>> > >> > > > >>> yeah the doc is pretty sparse. > > > >> >>> > >> > > > >>> > > > >> >>> > >> > > > >>> If I understand you correctly, I will wait for a > > new > > > >> >>> patch set > > > >> >>> > >> > before > > > >> >>> > >> > > > >>> merging the existing one. Right? > > > >> >>> > >> > > > >>> > > > >> >>> > >> > > > >>> Rainer > > > >> >>> > >> > > > >>> _______________________________________________ > > > >> >>> > >> > > > >>> rsyslog mailing list > > > >> >>> > >> > > > >>> > http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> >>> > >> > > > >>> http://www.rsyslog.com/professional-services/ > > > >> >>> > >> > > > >>> What's up with rsyslog? Follow > > > >> >>> https://twitter.com/rgerhards > > > >> >>> > >> > > > >>> NOTE WELL: This is a PUBLIC mailing list, posts > are > > > >> >>> ARCHIVED > > > >> >>> > by > > > >> >>> > >> a > > > >> >>> > >> > > > myriad > > > >> >>> > >> > > > >>> of sites beyond our control. PLEASE UNSUBSCRIBE > and > > > DO > > > >> NOT > > > >> >>> > POST > > > >> >>> > >> if > > > >> >>> > >> > > you > > > >> >>> > >> > > > >>> DON'T LIKE THAT. > > > >> >>> > >> > > > >>> > > > >> >>> > >> > > > >> > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > Hi, > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > Sorry for breaking the continuation here, I finally > > > >> managed > > > >> >>> to > > > >> >>> > get > > > >> >>> > >> > some > > > >> >>> > >> > > > > time to work on this today. > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > Patches are attached. Just for clarity, I am > > attaching > > > >> >>> > >> all(actually > > > >> >>> > >> > 2) > > > >> >>> > >> > > > > relevant patches(even though one of them is not > > > changed). > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > Changes made: > > > >> >>> > >> > > > > - removed the patch that implemented concat > > > >> >>> > >> > > > > - enhanced the wrap method to have 2 variants > > wrap(str, > > > >> >>> wrapper) > > > >> >>> > >> and > > > >> >>> > >> > > > > wrap(str, wrapper, wrapper_escape) > > > >> >>> > >> > > > > - kept the replace (and wrap first cut) patch > > > untouched. > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > -- > > > >> >>> > >> > > > > Regards, > > > >> >>> > >> > > > > Janmejay > > > >> >>> > >> > > > > http://codehunk.wordpress.com > > > >> >>> > >> > > > > > > > >> >>> > >> > > > > > > >> >>> > >> > > > > > > >> >>> > >> > > > > > > >> >>> > >> > > > -- > > > >> >>> > >> > > > Regards, > > > >> >>> > >> > > > Janmejay > > > >> >>> > >> > > > http://codehunk.wordpress.com > > > >> >>> > >> > > > _______________________________________________ > > > >> >>> > >> > > > rsyslog mailing list > > > >> >>> > >> > > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> >>> > >> > > > http://www.rsyslog.com/professional-services/ > > > >> >>> > >> > > > What's up with rsyslog? Follow > > > >> https://twitter.com/rgerhards > > > >> >>> > >> > > > NOTE WELL: This is a PUBLIC mailing list, posts are > > > >> ARCHIVED > > > >> >>> by a > > > >> >>> > >> > myriad > > > >> >>> > >> > > > of sites beyond our control. PLEASE UNSUBSCRIBE and > DO > > > NOT > > > >> >>> POST if > > > >> >>> > >> you > > > >> >>> > >> > > > DON'T LIKE THAT. > > > >> >>> > >> > > > > > > >> >>> > >> > > _______________________________________________ > > > >> >>> > >> > > rsyslog mailing list > > > >> >>> > >> > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> >>> > >> > > http://www.rsyslog.com/professional-services/ > > > >> >>> > >> > > What's up with rsyslog? Follow > > > https://twitter.com/rgerhards > > > >> >>> > >> > > NOTE WELL: This is a PUBLIC mailing list, posts are > > > ARCHIVED > > > >> by > > > >> >>> a > > > >> >>> > >> myriad > > > >> >>> > >> > > of sites beyond our control. PLEASE UNSUBSCRIBE and DO > > NOT > > > >> POST > > > >> >>> if > > > >> >>> > you > > > >> >>> > >> > > DON'T LIKE THAT. > > > >> >>> > >> > > > > > >> >>> > >> > _______________________________________________ > > > >> >>> > >> > rsyslog mailing list > > > >> >>> > >> > http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> >>> > >> > http://www.rsyslog.com/professional-services/ > > > >> >>> > >> > What's up with rsyslog? Follow > > https://twitter.com/rgerhards > > > >> >>> > >> > NOTE WELL: This is a PUBLIC mailing list, posts are > > ARCHIVED > > > >> by a > > > >> >>> > myriad > > > >> >>> > >> > of sites beyond our control. PLEASE UNSUBSCRIBE and DO > NOT > > > POST > > > >> >>> if you > > > >> >>> > >> > DON'T LIKE THAT. > > > >> >>> > >> > > > > >> >>> > >> _______________________________________________ > > > >> >>> > >> rsyslog mailing list > > > >> >>> > >> http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> >>> > >> http://www.rsyslog.com/professional-services/ > > > >> >>> > >> What's up with rsyslog? Follow > https://twitter.com/rgerhards > > > >> >>> > >> NOTE WELL: This is a PUBLIC mailing list, posts are > ARCHIVED > > > by a > > > >> >>> myriad > > > >> >>> > >> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT > > POST > > > >> if > > > >> >>> you > > > >> >>> > >> DON'T LIKE THAT. > > > >> >>> > >> > > > >> >>> > > > > > >> >>> > > > > >> >>> > > > > >> >>> > -- > > > >> >>> > Regards, > > > >> >>> > Janmejay > > > >> >>> > http://codehunk.wordpress.com > > > >> >>> > > > > >> >>> > _______________________________________________ > > > >> >>> > rsyslog mailing list > > > >> >>> > http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> >>> > http://www.rsyslog.com/professional-services/ > > > >> >>> > What's up with rsyslog? Follow https://twitter.com/rgerhards > > > >> >>> > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED > by > > a > > > >> >>> myriad > > > >> >>> > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT > POST > > if > > > >> you > > > >> >>> > DON'T LIKE THAT. > > > >> >>> > > > > >> >>> _______________________________________________ > > > >> >>> rsyslog mailing list > > > >> >>> http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> >>> http://www.rsyslog.com/professional-services/ > > > >> >>> What's up with rsyslog? Follow https://twitter.com/rgerhards > > > >> >>> NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by > a > > > >> myriad > > > >> >>> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST > if > > > you > > > >> >>> DON'T LIKE THAT. > > > >> >>> > > > >> >> > > > >> >> The last doc-patch had a typo, this fixes it, and applies after > it. > > > >> >> > > > >> >> -- > > > >> >> Regards, > > > >> >> Janmejay > > > >> >> http://codehunk.wordpress.com > > > >> >> > > > >> > > > > >> > > > > >> > > > > >> > -- > > > >> > Regards, > > > >> > Janmejay > > > >> > http://codehunk.wordpress.com > > > >> > > > > >> > > > >> > > > >> > > > >> -- > > > >> Regards, > > > >> Janmejay > > > >> http://codehunk.wordpress.com > > > >> > > > >> _______________________________________________ > > > >> rsyslog mailing list > > > >> http://lists.adiscon.net/mailman/listinfo/rsyslog > > > >> http://www.rsyslog.com/professional-services/ > > > >> What's up with rsyslog? Follow https://twitter.com/rgerhards > > > >> NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a > > myriad > > > >> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if > you > > > >> DON'T LIKE THAT. > > > >> > > > > > > > > > > > _______________________________________________ > > > rsyslog mailing list > > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > > http://www.rsyslog.com/professional-services/ > > > What's up with rsyslog? Follow https://twitter.com/rgerhards > > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a > myriad > > > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > > > DON'T LIKE THAT. > > > > > > > > > > > -- > > Regards, > > Janmejay > > http://codehunk.wordpress.com > > _______________________________________________ > > rsyslog mailing list > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > http://www.rsyslog.com/professional-services/ > > What's up with rsyslog? Follow https://twitter.com/rgerhards > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > > DON'T LIKE THAT. > > > _______________________________________________ > rsyslog mailing list > http://lists.adiscon.net/mailman/listinfo/rsyslog > http://www.rsyslog.com/professional-services/ > What's up with rsyslog? Follow https://twitter.com/rgerhards > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT.
