|
@@ -41,10 +41,10 @@ discard block |
|
|
block discarded – undo |
|
41
|
41
|
$this->clientIp = current(swoole_get_local_ip()) ?: gethostname(); |
|
42
|
42
|
} |
|
43
|
43
|
if (isset($settings['pull_timeout'])) { |
|
44
|
|
- $this->pullTimeout = (int)$settings['pull_timeout']; |
|
|
44
|
+ $this->pullTimeout = (int) $settings['pull_timeout']; |
|
45
|
45
|
} |
|
46
|
46
|
if (isset($settings['backup_old_env'])) { |
|
47
|
|
- $this->backupOldEnv = (bool)$settings['backup_old_env']; |
|
|
47
|
+ $this->backupOldEnv = (bool) $settings['backup_old_env']; |
|
48
|
48
|
} |
|
49
|
49
|
} |
|
50
|
50
|
|
|
@@ -73,11 +73,11 @@ discard block |
|
|
block discarded – undo |
|
73
|
73
|
$settings = [ |
|
74
|
74
|
'server' => getenv('APOLLO_SERVER'), |
|
75
|
75
|
'app_id' => getenv('APOLLO_APP_ID'), |
|
76
|
|
- 'cluster' => ($cluster = (string)getenv('APOLLO_CLUSTER')) !== '' ? $cluster : null, |
|
77
|
|
- 'namespaces' => ($namespaces = (string)getenv('APOLLO_NAMESPACES')) !== '' ? explode(',', $namespaces) : null, |
|
78
|
|
- 'client_ip' => ($clientIp = (string)getenv('APOLLO_CLIENT_IP')) !== '' ? $clientIp : null, |
|
79
|
|
- 'pull_timeout' => ($pullTimeout = (int)getenv('APOLLO_PULL_TIMEOUT')) > 0 ? $pullTimeout : null, |
|
80
|
|
- 'backup_old_env' => ($backupOldEnv = (bool)getenv('APOLLO_BACKUP_OLD_ENV')) ? $backupOldEnv : null, |
|
|
76
|
+ 'cluster' => ($cluster = (string) getenv('APOLLO_CLUSTER')) !== '' ? $cluster : null, |
|
|
77
|
+ 'namespaces' => ($namespaces = (string) getenv('APOLLO_NAMESPACES')) !== '' ? explode(',', $namespaces) : null, |
|
|
78
|
+ 'client_ip' => ($clientIp = (string) getenv('APOLLO_CLIENT_IP')) !== '' ? $clientIp : null, |
|
|
79
|
+ 'pull_timeout' => ($pullTimeout = (int) getenv('APOLLO_PULL_TIMEOUT')) > 0 ? $pullTimeout : null, |
|
|
80
|
+ 'backup_old_env' => ($backupOldEnv = (bool) getenv('APOLLO_BACKUP_OLD_ENV')) ? $backupOldEnv : null, |
|
81
|
81
|
]; |
|
82
|
82
|
return new static($settings); |
|
83
|
83
|
} |
|
@@ -93,8 +93,8 @@ discard block |
|
|
block discarded – undo |
|
93
|
93
|
'cluster' => isset($options['apollo-cluster']) && $options['apollo-cluster'] !== '' ? $options['apollo-cluster'] : null, |
|
94
|
94
|
'namespaces' => !empty($options['apollo-namespaces']) ? $options['apollo-namespaces'] : null, |
|
95
|
95
|
'client_ip' => isset($options['apollo-client-ip']) && $options['apollo-client-ip'] !== '' ? $options['apollo-client-ip'] : null, |
|
96
|
|
- 'pull_timeout' => isset($options['apollo-pull-timeout']) ? (int)$options['apollo-pull-timeout'] : null, |
|
97
|
|
- 'backup_old_env' => isset($options['apollo-backup-old-env']) ? (bool)$options['apollo-backup-old-env'] : null, |
|
|
96
|
+ 'pull_timeout' => isset($options['apollo-pull-timeout']) ? (int) $options['apollo-pull-timeout'] : null, |
|
|
97
|
+ 'backup_old_env' => isset($options['apollo-backup-old-env']) ? (bool) $options['apollo-backup-old-env'] : null, |
|
98
|
98
|
]; |
|
99
|
99
|
return new static($settings); |
|
100
|
100
|
} |
|
@@ -116,7 +116,7 @@ discard block |
|
|
block discarded – undo |
|
116
|
116
|
$configs = []; |
|
117
|
117
|
$uri = sprintf('%s/configs/%s/%s/', $this->server, $this->appId, $this->cluster); |
|
118
|
118
|
foreach ($namespaces as $namespace) { |
|
119
|
|
- $url = $uri . $namespace . '?' . http_build_query([ |
|
|
119
|
+ $url = $uri.$namespace.'?'.http_build_query([ |
|
120
|
120
|
'releaseKey' => $withReleaseKey && isset($this->releaseKeys[$namespace]) ? $this->releaseKeys[$namespace] : null, |
|
121
|
121
|
'ip' => $this->clientIp, |
|
122
|
122
|
]); |
|
@@ -146,11 +146,11 @@ discard block |
|
|
block discarded – undo |
|
146
|
146
|
$all = $this->pullAll(false, $options); |
|
147
|
147
|
if (count($all) !== count($this->namespaces)) { |
|
148
|
148
|
$lackNamespaces = array_diff($this->namespaces, array_keys($all)); |
|
149
|
|
- throw new \RuntimeException('Missing Apollo configurations for namespaces ' . implode(',', $lackNamespaces)); |
|
|
149
|
+ throw new \RuntimeException('Missing Apollo configurations for namespaces '.implode(',', $lackNamespaces)); |
|
150
|
150
|
} |
|
151
|
151
|
$configs = []; |
|
152
|
152
|
foreach ($all as $namespace => $config) { |
|
153
|
|
- $configs[] = '# Namespace: ' . $config['namespaceName']; |
|
|
153
|
+ $configs[] = '# Namespace: '.$config['namespaceName']; |
|
154
|
154
|
ksort($config['configurations']); |
|
155
|
155
|
foreach ($config['configurations'] as $key => $value) { |
|
156
|
156
|
$key = preg_replace('/[^a-zA-Z0-9_.]/', '_', $key); |
|
@@ -161,7 +161,7 @@ discard block |
|
|
block discarded – undo |
|
161
|
161
|
throw new \RuntimeException('Empty Apollo configuration list'); |
|
162
|
162
|
} |
|
163
|
163
|
if ($this->backupOldEnv && file_exists($filepath)) { |
|
164
|
|
- rename($filepath, $filepath . '.' . date('YmdHis')); |
|
|
164
|
+ rename($filepath, $filepath.'.'.date('YmdHis')); |
|
165
|
165
|
} |
|
166
|
166
|
$fileContent = implode(PHP_EOL, $configs); |
|
167
|
167
|
if (Context::inCoroutine()) { |
|
@@ -201,7 +201,7 @@ discard block |
|
|
block discarded – undo |
|
201
|
201
|
if (!empty($this->notifications) && current($this->notifications)['notificationId'] !== -1) { // Ignore the first pull |
|
202
|
202
|
$callback($notifications); |
|
203
|
203
|
} |
|
204
|
|
- array_walk($notifications, function (&$notification) { |
|
|
204
|
+ array_walk($notifications, function(&$notification) { |
|
205
|
205
|
unset($notification['messages']); |
|
206
|
206
|
}); |
|
207
|
207
|
$this->notifications = array_merge($this->notifications, array_column($notifications, null, 'namespaceName')); |