Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
95f630da
Commit
95f630da
authored
Jul 06, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
even more debug
parent
4a62a11f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
lib/gitlab/import_export/command_line_util.rb
lib/gitlab/import_export/command_line_util.rb
+2
-1
lib/gitlab/import_export/saver.rb
lib/gitlab/import_export/saver.rb
+1
-0
lib/gitlab/sidekiq_middleware/memory_killer.rb
lib/gitlab/sidekiq_middleware/memory_killer.rb
+2
-2
No files found.
lib/gitlab/import_export/command_line_util.rb
View file @
95f630da
...
@@ -28,7 +28,8 @@ module Gitlab
...
@@ -28,7 +28,8 @@ module Gitlab
end
end
def
execute
(
cmd
)
def
execute
(
cmd
)
_output
,
status
=
Gitlab
::
Popen
.
popen
(
cmd
)
output
,
status
=
Gitlab
::
Popen
.
popen
(
cmd
)
@shared
.
error
(
output
.
to_s
)
unless
status_zero?
status
.
zero?
status
.
zero?
end
end
...
...
lib/gitlab/import_export/saver.rb
View file @
95f630da
...
@@ -17,6 +17,7 @@ module Gitlab
...
@@ -17,6 +17,7 @@ module Gitlab
Rails
.
logger
.
info
(
"Saved project export
#{
archive_file
}
"
)
Rails
.
logger
.
info
(
"Saved project export
#{
archive_file
}
"
)
archive_file
archive_file
else
else
@shared
.
error
(
"Unable to save
#{
archive_file
}
into
#{
@shared
.
export_path
}
"
)
false
false
end
end
rescue
=>
e
rescue
=>
e
...
...
lib/gitlab/sidekiq_middleware/memory_killer.rb
View file @
95f630da
...
@@ -29,11 +29,11 @@ module Gitlab
...
@@ -29,11 +29,11 @@ module Gitlab
"in
#{
GRACE_TIME
}
seconds"
"in
#{
GRACE_TIME
}
seconds"
sleep
(
GRACE_TIME
)
sleep
(
GRACE_TIME
)
Sidekiq
.
logger
.
warn
"sending SIGTERM to PID
#{
Process
.
pid
}
"
Sidekiq
.
logger
.
warn
"sending SIGTERM to PID
#{
Process
.
pid
}
- Worker
#{
worker
.
class
}
- JID-
#{
job
[
'jid'
]
}
"
Process
.
kill
(
'SIGTERM'
,
Process
.
pid
)
Process
.
kill
(
'SIGTERM'
,
Process
.
pid
)
Sidekiq
.
logger
.
warn
"waiting
#{
SHUTDOWN_WAIT
}
seconds before sending "
\
Sidekiq
.
logger
.
warn
"waiting
#{
SHUTDOWN_WAIT
}
seconds before sending "
\
"
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
"
"
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
- Worker
#{
worker
.
class
}
- JID-
#{
job
[
'jid'
]
}
"
sleep
(
SHUTDOWN_WAIT
)
sleep
(
SHUTDOWN_WAIT
)
Sidekiq
.
logger
.
warn
"sending
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
- Worker
#{
worker
.
class
}
- JID-
#{
job
[
'jid'
]
}
"
Sidekiq
.
logger
.
warn
"sending
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
- Worker
#{
worker
.
class
}
- JID-
#{
job
[
'jid'
]
}
"
...
...
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