Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tabacco
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai3
tools
tabacco
Commits
6f713bdd
Commit
6f713bdd
authored
Nov 12, 2020
by
ale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove extraneous log prefix changes
parent
5253979f
Pipeline
#8537
passed with stages
in 1 minute and 15 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
repository_restic.go
repository_restic.go
+1
-2
No files found.
repository_restic.go
View file @
6f713bdd
...
...
@@ -369,9 +369,8 @@ type resticMessage struct {
// Scan the output of 'restic backup' for the snapshot ID. Modifies backup/dataset objects.
func
(
r
*
resticRepository
)
RunBackup
(
ctx
context
.
Context
,
shell
*
Shell
,
backup
*
Backup
,
ds
*
Dataset
,
cmd
string
)
error
{
logPrefix
:=
fmt
.
Sprintf
(
"backup=%s dataset=%s"
,
backup
.
ID
,
ds
.
ID
)
return
active
.
WithResticStatus
(
jobs
.
GetID
(
ctx
),
backup
,
ds
,
func
(
progressCh
chan
*
resticStatusMessage
)
error
{
return
shell
.
RunWithStdoutCallback
(
ctx
,
cmd
,
logPrefix
,
func
(
line
[]
byte
)
{
return
shell
.
RunWithStdoutCallback
(
ctx
,
cmd
,
func
(
line
[]
byte
)
{
var
msg
resticMessage
if
err
:=
json
.
Unmarshal
(
line
,
&
msg
);
err
!=
nil
{
log
.
Printf
(
"error parsing restic JSON message: %v (%s)"
,
err
,
line
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment