takeltau 0.45.17 → 0.45.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/takeltau/ship/project/create.rb +1 -1
- data/lib/takeltau/ship/project/restart.rb +2 -15
- data/lib/takeltau/ship/project/start.rb +5 -5
- data/lib/takeltau/version +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 83e83d1198f3013bc8dccd2cf87482a1c4a4fbead2db74c243ce1a12465c2fb2
|
|
4
|
+
data.tar.gz: c439865666c24e03d1f3a8349cb1e8c82c31137c09365d1987cbb545506c6ad5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7e38db0e1a20a6613d08d721d8e7ae6e1b88b59deedb2cc451ccb29bbf5e182319a79d7dca49f86f3adca3a4db33fbbe18c9da65ec69c33ea5d30bfe2f157831
|
|
7
|
+
data.tar.gz: b213d047e992ade91debbf52a743eaac0d5c196f36babc13d4878f739d7dcb1fd27931a720d95f85a762731f8afc61d3c41675608bede6e6fd3fc4e790056a01
|
|
@@ -17,7 +17,7 @@ module ShipProjectCreate
|
|
|
17
17
|
ship_hostname_suffix: 'dump',
|
|
18
18
|
publish_ports: false
|
|
19
19
|
)
|
|
20
|
-
return false unless _ship_container_lib_started?
|
|
20
|
+
return false unless _ship_container_lib_started?(ship_status, false)
|
|
21
21
|
|
|
22
22
|
say "#{verb} takelship project \"#{project}\"."
|
|
23
23
|
true
|
|
@@ -5,20 +5,7 @@ module ShipProjectRestart
|
|
|
5
5
|
# Restart a takelship
|
|
6
6
|
def ship_project_restart(project)
|
|
7
7
|
say ship_container_stop
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
private
|
|
13
|
-
|
|
14
|
-
# Wait until a takelship container is stopped
|
|
15
|
-
def _ship_project_restart_wait
|
|
16
|
-
cmd_ship_docker_wait = format(
|
|
17
|
-
config.active['cmd_ship_docker_wait'],
|
|
18
|
-
ship_docker: config.active['cmd_ship_docker'],
|
|
19
|
-
ship_hostname: _ship_container_lib_ship_hostname
|
|
20
|
-
)
|
|
21
|
-
|
|
22
|
-
run cmd_ship_docker_wait
|
|
8
|
+
sleep 1 until ship_project_start project, mute: true
|
|
9
|
+
true
|
|
23
10
|
end
|
|
24
11
|
end
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
# tau ship project start
|
|
4
4
|
module ShipProjectStart
|
|
5
5
|
# Start a takelship
|
|
6
|
-
def ship_project_start(project)
|
|
6
|
+
def ship_project_start(project, mute: false)
|
|
7
7
|
return false unless _ship_project_start_matrjoschka?
|
|
8
8
|
|
|
9
9
|
takelship = _ship_info_lib_get_takelshipinfo
|
|
@@ -23,7 +23,7 @@ module ShipProjectStart
|
|
|
23
23
|
|
|
24
24
|
log.debug "Starting takelship project \"#{project}\""
|
|
25
25
|
ship_status = _ship_container_lib_docker_privileged ports, project
|
|
26
|
-
return false unless _ship_container_lib_started?
|
|
26
|
+
return false unless _ship_container_lib_started?(ship_status, mute)
|
|
27
27
|
|
|
28
28
|
_ship_project_start_print_banner project
|
|
29
29
|
say
|
|
@@ -62,11 +62,11 @@ module ShipProjectStart
|
|
|
62
62
|
end
|
|
63
63
|
|
|
64
64
|
# check if the ship started successfully
|
|
65
|
-
def _ship_container_lib_started?(ship_status)
|
|
65
|
+
def _ship_container_lib_started?(ship_status, mute)
|
|
66
66
|
return true if ship_status[2].zero?
|
|
67
67
|
|
|
68
|
-
say 'Unable to start the takelship. The error message was:'
|
|
69
|
-
say ship_status[1].to_s.strip.delete_prefix('"').delete_suffix('"')
|
|
68
|
+
say 'Unable to start the takelship. The error message was:' unless mute
|
|
69
|
+
say ship_status[1].to_s.strip.delete_prefix('"').delete_suffix('"') unless mute
|
|
70
70
|
false
|
|
71
71
|
end
|
|
72
72
|
|
data/lib/takeltau/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.45.
|
|
1
|
+
0.45.19
|