StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FQDN support for allocations, and JS bug fix.

Browse source
This commit is contained in:
Dane Everitt 2016-10-21 17:33:26 -04:00
parent 176d92176e
commit ad906e0680
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 51 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/Repositories/NodeRepository.php
View file

@ -164,7 +164,17 @@ class NodeRepository {
try {
foreach($allocations as $rawIP => $ports) {
$parsedIP = Network::parse($rawIP);
try {
$setAlias = null;
$parsedIP = Network::parse($rawIP);
} catch (\Exception $ex) {
try {
$setAlias = $rawIP;
$parsedIP = Network::parse(gethostbyname($rawIP));
} catch (\Exception $ex) {
throw $ex;
}
}
foreach($parsedIP as $ip) {
foreach($ports as $port) {
if (!is_int($port) && !preg_match('/^(\d{1,5})-(\d{1,5})$/', $port)) {
@ -182,6 +192,7 @@ class NodeRepository {
'node' => $node->id,
'ip' => $ip,
'port' => $assignPort,
'ip_alias' => $setAlias,
'assigned_to' => null
]);
$alloc->save();
@ -198,6 +209,7 @@ class NodeRepository {
'node' => $node->id,
'ip' => $ip,
'port' => $port,
'ip_alias' => $setAlias,
'assigned_to' => null
]);
$alloc->save();
@ -208,7 +220,7 @@ class NodeRepository {
}
DB::commit();
return true;
// return true;
} catch (\Exception $ex) {
DB::rollBack();
throw $ex;