From 726b399e4747032a3d052339cd62c57ae5b6767c Mon Sep 17 00:00:00 2001 From: KatolaZ Date: Sat, 15 Jul 2017 01:26:39 +0100 Subject: [PATCH] pipeline from spool to worker is done -- added examples --- commits.go | 6 +- config.go | 41 +------------- examples/create_spool_message.sh | 30 ++++++++++ examples/scorsh_example.cfg | 29 ++++++++++ examples/worker1/allowed_users.asc | 62 +++++++++++++++++++++ examples/worker1/allowed_users.pgp | Bin 0 -> 3073 bytes examples/worker1/worker1.cfg | 24 ++++++++ examples/worker2/allowed_users.asc | 62 +++++++++++++++++++++ examples/worker2/allowed_users.pgp | Bin 0 -> 3073 bytes examples/worker2/worker2.cfg | 14 +++++ sandpit/test_parse_message.go | 44 +++++++++++++++ sandpit/test_regexp.go | 26 +++++++++ sandpit/test_worker_cfg.go | 63 +++++++++++++++++++++ scorsh.cfg | 48 +++++----------- scorsh.go | 39 ++++++++++--- spooler.go | 42 ++++++++++---- types.go | 86 ++++++++++++++++++++++++----- workers.go | 46 +++++++++------ 18 files changed, 537 insertions(+), 125 deletions(-) create mode 100755 examples/create_spool_message.sh create mode 100644 examples/scorsh_example.cfg create mode 100644 examples/worker1/allowed_users.asc create mode 100644 examples/worker1/allowed_users.pgp create mode 100644 examples/worker1/worker1.cfg create mode 100644 examples/worker2/allowed_users.asc create mode 100644 examples/worker2/allowed_users.pgp create mode 100644 examples/worker2/worker2.cfg create mode 100644 sandpit/test_parse_message.go create mode 100644 sandpit/test_regexp.go create mode 100644 sandpit/test_worker_cfg.go diff --git a/commits.go b/commits.go index d69cc2b..7703273 100644 --- a/commits.go +++ b/commits.go @@ -53,9 +53,9 @@ func walk_commits(msg SCORSHmsg, w *SCORSHworker) error { fmt.Printf("Inside parse_commits\n") - reponame := msg.repo - old_rev := msg.old_rev - new_rev := msg.new_rev + reponame := msg.Repo + old_rev := msg.Old_rev + new_rev := msg.New_rev repo, err := git.OpenRepository(reponame) if err != nil { diff --git a/config.go b/config.go index 112b158..38ce531 100644 --- a/config.go +++ b/config.go @@ -1,7 +1,6 @@ package main import ( - "bytes" "fmt" "github.com/go-yaml/yaml" "io" @@ -41,7 +40,7 @@ func ReadGlobalConfig(fname string) *SCORSHmaster { } if cfg.LogPrefix != "" { - log.SetPrefix(cfg.LogPrefix) + log.SetPrefix(cfg.LogPrefix+ " ") } // If the user has not set a spooldir, crash loudly @@ -54,46 +53,10 @@ func ReadGlobalConfig(fname string) *SCORSHmaster { // Check if the user wants to redirect the logs to a file // If we got so far, then there is some sort of config in cfg + log.Printf("----- Starting SCORSH -----\n") log.Printf("Successfully read config from %s\n", fname) return cfg } -func (cfg *SCORSHmaster) String() string { - - var buff bytes.Buffer - - buff.WriteString("spooldir: ") - buff.WriteString(cfg.Spooldir) - buff.WriteString("\nlogfile: ") - buff.WriteString(cfg.Logfile) - buff.WriteString("\nlogprefix: ") - buff.WriteString(cfg.LogPrefix) - buff.WriteString("\nWorkers: \n") - - for _, w := range cfg.Workers { - buff.WriteString("---\n name: ") - buff.WriteString(w.Name) - buff.WriteString("\n repos: ") - for _, r := range w.Repos { - buff.WriteString("\n ") - buff.WriteString(r) - } - buff.WriteString("\n folder: ") - buff.WriteString(w.Folder) - buff.WriteString("\n logfile: ") - buff.WriteString(w.Logfile) - buff.WriteString("\n tagfile: ") - buff.WriteString(w.Tagfile) - buff.WriteString("\n keyrings: ") - for _, k := range w.Keyrings { - buff.WriteString("\n ") - buff.WriteString(k) - } - buff.WriteString("\n...\n") - - } - - return buff.String() -} diff --git a/examples/create_spool_message.sh b/examples/create_spool_message.sh new file mode 100755 index 0000000..22c5839 --- /dev/null +++ b/examples/create_spool_message.sh @@ -0,0 +1,30 @@ +#!/bin/sh + + + +##function +write_message(){ + + orev=${3:-"a1b2c3d4e5f6"} + nrev=${4:-"9a8b7c6d5e4f"} + + + cat < [ [3 zW5^{HZS71*a*6F0(k3cwCSuPhC;L2SpVRrCXU+SrS?l{f|My$(_g@PDfPz2()O^1^ z0dR){5g*4pc=?whJP3uXWJ>@DwE!rPPjKic#JPTEW*yt(=!Po0Bkab%oqGq0cbB|P zgEHDuzq}8ATJGAyRlMn)5E}Py1Ku_6;0GcAKpEUjd*vL!c5@^8OD?dV8?j&WZf-<= z$pxLbQRQns#EqDhTmrzCzm6~0zVCN+&cDaCvsYIj4U!EvI?*{T4hJvvqac_u&AAuR zZ(6hrq!XgFULoeF0<%NdGU0&9BsMCIHL^RzszPN-6E*bAdgJhoD9!=a^$8m=Hi&F! zdeA46lXhnkeOg=QLxeCx$HkrB<_8h&*5rufsrOgmvb`w;0%Z5_ZI4|c%z5vsog!!B zA4Pp|Ejt0}=q9R-s#XK~^;=b9?F%$V;&aMO*N-WakCBoQu;sv6xm$-A_2pfRL6Ymt znRwhb@y#y28^(@=vHN{}_RX2@w7|B6UaKB`+%IA$xjklUiNedzovvwrQ7Q9gk_ zMhE+!K6~=xNo+ZJVQ>%TMryv^@mlx@n48r($2JDS-g-eJ-0g?}D6xD=; z%E9=B5rP6RC`<|pgGoanP$UGpF&qdX#8z9pe-O|NN6O*N*AjEA*dB}KpwKo6F7~esRR#uNp zjKCZD?ok;)3(!u;PJI$Zy&8O}dCFXOD!jnL1JGOsrQ^*zlZ$ZJBs!6IiDvhd+0GbVB9lmmd%au9? zLSP!}B{odgUB8wisKMjdYelTLgn?)lxa3c*F4I4}rRXo^*PW zrFNY$Ni-Q?=h{ZRs8!qNvW9d1!vv3$aeR+=RsDEr+Z3Q@jC2+y=BvM!`z;b4j3uE4 zn5iECJxejbLBB;YU|(GJ;_v9+}85mMf zEs0#`iYs~#U`L}-a_J|nAI1XezPwNd>e5S(vC4r0#Nq{7a{3O3wHz%;9%oh%r=^gC z-Crlot>F3N_6A&A9eZ2v_V&oF4O_hY?*UrKqY|^|3csKZFTJ*dqlvGF`Ym2^Ijhe- zXhRi`gFe(${jSaD~Zk~ND6a?6b*1wSb-&*kX6uui!E=r`^T`C|9p^&cpquodP;9V~_9`0y?dPl%RxD zxUG8Jv=8lQb5by2YSXv6_D{DT<#FWx2z8D%MxYMH1FBwXR@^7cPkJZlx)EFIdv|`U zo0tdb@Ln;50DGq4oWS;NA|{%iK^nw~HF_G9R{A-puFsEC-|@a}9?(mqnKP2nSVy8e zQLYqP)PB>^;R>LIc6lMu9rK08LH8${n>^tkjDePw&eb@G4kH?^i zakg)Z>-7LteQz$bqvP(MN_Ukreal_D1o?_Znb?2Xz&BG`wJC#D8zA_5x}WB{62{lx zYj4bnl`W>s2etPqVSlp%eknmHLP!`c4Tb#&cOtz7RLyjJm}D&_nPGEsLy9sf@Y1_C zqJWC>yWsw*WAiOpQx(+fWyVr|_)QoS`PCs&|DXZCq5;JR#m%Vde$xP#f(pX^LBSa{ zKs(dx@QN;|$aF5FB&RA=VqEk0b_03@Q+{^*qq8>^WQtWrxEF^P`rU<8ZYsVncmvNttk z{1v&1ojs}YMiV!jXGGSiQ*u$1UACFYFu@A9hQZh|Mk?4PNWNHRBTCPs3>#YSd8AsX zbx-`C7w-++U&oZtL&cxS1L^BMQxg;V=E)0e<17S zWu*^CA+D8L+8w=cbR(-xy!R1iOFd`sJ*Bw8&JsI)dB4iWY2v1&jQ6niH_+gyQ^qy1 zZWWwx<3dqmlf*9XdH~}WST-qzZM<)F$*vGxu07Yw9};Ij66flbfOtM#g-+0;PR*Rc zw~od1%*c~|4h?IW`rPWk@(tbxag_2gom+o1>iV%JgPRr2q{~5pmVJTbzU(eS7Rtw% zFGTIwsnO!X3D&z){qJ!6o)aegnmu_G=euXCquCHI@H=I62#M0SWt%C>>X@VO_qDSh zuxc}%*5}dIw{uJsD{A7jho7D!6(#K5*JDEYZBzL9p0Y||vnn@vJ!<2uZoX}3F(%<| zq>w+$urbwpct&|ry-d|})L@~`x#jplw`lGH=E&%eK?Z=O6(o$J*pCxxH;++sdT`1% zu^+TD{U3 zW5^{HZS71*a*6F0(k3cwCSuPhC;L2SpVRrCXU+SrS?l{f|My$(_g@PDfPz2()O^1^ z0dR){5g*4pc=?whJP3uXWJ>@DwE!rPPjKic#JPTEW*yt(=!Po0Bkab%oqGq0cbB|P zgEHDuzq}8ATJGAyRlMn)5E}Py1Ku_6;0GcAKpEUjd*vL!c5@^8OD?dV8?j&WZf-<= z$pxLbQRQns#EqDhTmrzCzm6~0zVCN+&cDaCvsYIj4U!EvI?*{T4hJvvqac_u&AAuR zZ(6hrq!XgFULoeF0<%NdGU0&9BsMCIHL^RzszPN-6E*bAdgJhoD9!=a^$8m=Hi&F! zdeA46lXhnkeOg=QLxeCx$HkrB<_8h&*5rufsrOgmvb`w;0%Z5_ZI4|c%z5vsog!!B zA4Pp|Ejt0}=q9R-s#XK~^;=b9?F%$V;&aMO*N-WakCBoQu;sv6xm$-A_2pfRL6Ymt znRwhb@y#y28^(@=vHN{}_RX2@w7|B6UaKB`+%IA$xjklUiNedzovvwrQ7Q9gk_ zMhE+!K6~=xNo+ZJVQ>%TMryv^@mlx@n48r($2JDS-g-eJ-0g?}D6xD=; z%E9=B5rP6RC`<|pgGoanP$UGpF&qdX#8z9pe-O|NN6O*N*AjEA*dB}KpwKo6F7~esRR#uNp zjKCZD?ok;)3(!u;PJI$Zy&8O}dCFXOD!jnL1JGOsrQ^*zlZ$ZJBs!6IiDvhd+0GbVB9lmmd%au9? zLSP!}B{odgUB8wisKMjdYelTLgn?)lxa3c*F4I4}rRXo^*PW zrFNY$Ni-Q?=h{ZRs8!qNvW9d1!vv3$aeR+=RsDEr+Z3Q@jC2+y=BvM!`z;b4j3uE4 zn5iECJxejbLBB;YU|(GJ;_v9+}85mMf zEs0#`iYs~#U`L}-a_J|nAI1XezPwNd>e5S(vC4r0#Nq{7a{3O3wHz%;9%oh%r=^gC z-Crlot>F3N_6A&A9eZ2v_V&oF4O_hY?*UrKqY|^|3csKZFTJ*dqlvGF`Ym2^Ijhe- zXhRi`gFe(${jSaD~Zk~ND6a?6b*1wSb-&*kX6uui!E=r`^T`C|9p^&cpquodP;9V~_9`0y?dPl%RxD zxUG8Jv=8lQb5by2YSXv6_D{DT<#FWx2z8D%MxYMH1FBwXR@^7cPkJZlx)EFIdv|`U zo0tdb@Ln;50DGq4oWS;NA|{%iK^nw~HF_G9R{A-puFsEC-|@a}9?(mqnKP2nSVy8e zQLYqP)PB>^;R>LIc6lMu9rK08LH8${n>^tkjDePw&eb@G4kH?^i zakg)Z>-7LteQz$bqvP(MN_Ukreal_D1o?_Znb?2Xz&BG`wJC#D8zA_5x}WB{62{lx zYj4bnl`W>s2etPqVSlp%eknmHLP!`c4Tb#&cOtz7RLyjJm}D&_nPGEsLy9sf@Y1_C zqJWC>yWsw*WAiOpQx(+fWyVr|_)QoS`PCs&|DXZCq5;JR#m%Vde$xP#f(pX^LBSa{ zKs(dx@QN;|$aF5FB&RA=VqEk0b_03@Q+{^*qq8>^WQtWrxEF^P`rU<8ZYsVncmvNttk z{1v&1ojs}YMiV!jXGGSiQ*u$1UACFYFu@A9hQZh|Mk?4PNWNHRBTCPs3>#YSd8AsX zbx-`C7w-++U&oZtL&cxS1L^BMQxg;V=E)0e<17S zWu*^CA+D8L+8w=cbR(-xy!R1iOFd`sJ*Bw8&JsI)dB4iWY2v1&jQ6niH_+gyQ^qy1 zZWWwx<3dqmlf*9XdH~}WST-qzZM<)F$*vGxu07Yw9};Ij66flbfOtM#g-+0;PR*Rc zw~od1%*c~|4h?IW`rPWk@(tbxag_2gom+o1>iV%JgPRr2q{~5pmVJTbzU(eS7Rtw% zFGTIwsnO!X3D&z){qJ!6o)aegnmu_G=euXCquCHI@H=I62#M0SWt%C>>X@VO_qDSh zuxc}%*5}dIw{uJsD{A7jho7D!6(#K5*JDEYZBzL9p0Y||vnn@vJ!<2uZoX}3F(%<| zq>w+$urbwpct&|ry-d|})L@~`x#jplw`lGH=E&%eK?Z=O6(o$J*pCxxH;++sdT`1% zu^+TD{U