Skip to content

Commit f0ea831

Browse files
set default hub branch to master in cscli (#279)
1 parent 9b97633 commit f0ea831

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cmd/crowdsec-cli/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ API interaction:
123123
rootCmd.PersistentFlags().BoolVar(&wrn_lvl, "warning", false, "Set logging to warning.")
124124
rootCmd.PersistentFlags().BoolVar(&err_lvl, "error", false, "Set logging to error.")
125125

126-
rootCmd.PersistentFlags().StringVar(&cwhub.HubBranch, "branch", "", "Override hub branch on github")
126+
rootCmd.PersistentFlags().StringVar(&cwhub.HubBranch, "branch", "master", "Override hub branch on github")
127127
if err := rootCmd.PersistentFlags().MarkHidden("branch"); err != nil {
128128
log.Fatalf("failed to make branch hidden : %s", err)
129129
}

pkg/cwhub/download.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ func DownloadItem(target Item, tdir string, overwrite bool, dataFolder string) (
148148
}
149149

150150
//log.Infof("Downloading %s to %s", target.Name, tdir)
151-
req, err := http.NewRequest("GET", fmt.Sprintf(RawFileURLTemplate, HubBranch, target.RemotePath), nil)
151+
uri := fmt.Sprintf(RawFileURLTemplate, HubBranch, target.RemotePath)
152+
req, err := http.NewRequest("GET", uri, nil)
152153
if err != nil {
153154
log.Errorf("%s : request creation failed : %s", target.Name, err)
154155
return target, err
@@ -159,7 +160,7 @@ func DownloadItem(target Item, tdir string, overwrite bool, dataFolder string) (
159160
return target, err
160161
}
161162
if resp.StatusCode != 200 {
162-
log.Errorf("%s : non 200 response : %d", target.Name, resp.StatusCode)
163+
log.Errorf("%s : We got an error reaching %s : %d", target.Name, uri, resp.StatusCode)
163164
return target, fmt.Errorf("bad http code")
164165
}
165166
defer resp.Body.Close()

0 commit comments

Comments
 (0)