diff --git a/build/build-sdk-images/cpp/Dockerfile b/build/build-sdk-images/cpp/Dockerfile index ca34b68e58..4181f298cf 100644 --- a/build/build-sdk-images/cpp/Dockerfile +++ b/build/build-sdk-images/cpp/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2018 Google Inc. All Rights Reserved. +# Copyright 2018 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/cpp/build.sh b/build/build-sdk-images/cpp/build.sh index dc273e0cb1..1894151c5a 100644 --- a/build/build-sdk-images/cpp/build.sh +++ b/build/build-sdk-images/cpp/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/cpp/gen.sh b/build/build-sdk-images/cpp/gen.sh index 87871900b0..e27df31fc2 100755 --- a/build/build-sdk-images/cpp/gen.sh +++ b/build/build-sdk-images/cpp/gen.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/go/Dockerfile b/build/build-sdk-images/go/Dockerfile index 248ff2da83..74e607dddf 100644 --- a/build/build-sdk-images/go/Dockerfile +++ b/build/build-sdk-images/go/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/go/gen.sh b/build/build-sdk-images/go/gen.sh index 77dfbe7281..4f77b39895 100644 --- a/build/build-sdk-images/go/gen.sh +++ b/build/build-sdk-images/go/gen.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/go/test.sh b/build/build-sdk-images/go/test.sh index e99255d132..abd6a90926 100644 --- a/build/build-sdk-images/go/test.sh +++ b/build/build-sdk-images/go/test.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/node/Dockerfile b/build/build-sdk-images/node/Dockerfile index a6f3b827b3..1d5394788c 100644 --- a/build/build-sdk-images/node/Dockerfile +++ b/build/build-sdk-images/node/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/node/gen.sh b/build/build-sdk-images/node/gen.sh index 3af2ffb01a..726aa40942 100644 --- a/build/build-sdk-images/node/gen.sh +++ b/build/build-sdk-images/node/gen.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/node/test.sh b/build/build-sdk-images/node/test.sh index 9d66887ee6..246c18e7a0 100644 --- a/build/build-sdk-images/node/test.sh +++ b/build/build-sdk-images/node/test.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/rust/Dockerfile b/build/build-sdk-images/rust/Dockerfile index f9f4204c57..57332ea65b 100644 --- a/build/build-sdk-images/rust/Dockerfile +++ b/build/build-sdk-images/rust/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/tool/base/entrypoint.sh b/build/build-sdk-images/tool/base/entrypoint.sh index 54d2eefdab..281b195bac 100644 --- a/build/build-sdk-images/tool/base/entrypoint.sh +++ b/build/build-sdk-images/tool/base/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/tool/template/Dockerfile b/build/build-sdk-images/tool/template/Dockerfile index d107196b51..84725d8ab0 100644 --- a/build/build-sdk-images/tool/template/Dockerfile +++ b/build/build-sdk-images/tool/template/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/tool/template/build.sh b/build/build-sdk-images/tool/template/build.sh index 33da2f46f1..937b10b2d6 100644 --- a/build/build-sdk-images/tool/template/build.sh +++ b/build/build-sdk-images/tool/template/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/tool/template/gen.sh b/build/build-sdk-images/tool/template/gen.sh index cbb8f21928..ba92994060 100644 --- a/build/build-sdk-images/tool/template/gen.sh +++ b/build/build-sdk-images/tool/template/gen.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-sdk-images/tool/template/test.sh b/build/build-sdk-images/tool/template/test.sh index cf87c088e3..2a7d94baef 100644 --- a/build/build-sdk-images/tool/template/test.sh +++ b/build/build-sdk-images/tool/template/test.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/includes/sdk.mk b/build/includes/sdk.mk index 3b2c45d0d7..bbe2db5de9 100644 --- a/build/includes/sdk.mk +++ b/build/includes/sdk.mk @@ -1,4 +1,4 @@ -# Copyright 2019 Google Inc. All Rights Reserved. +# Copyright 2019 Google LLC All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pkg/apis/allocation/v1alpha1/doc.go b/pkg/apis/allocation/v1alpha1/doc.go index ae6c83d244..0997844d25 100644 --- a/pkg/apis/allocation/v1alpha1/doc.go +++ b/pkg/apis/allocation/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/allocation/v1alpha1/register.go b/pkg/apis/allocation/v1alpha1/register.go index c091277d34..96f5652bc5 100644 --- a/pkg/apis/allocation/v1alpha1/register.go +++ b/pkg/apis/allocation/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/gameserverallocations/cache.go b/pkg/gameserverallocations/cache.go index edf03e2b9a..0f666baaec 100644 --- a/pkg/gameserverallocations/cache.go +++ b/pkg/gameserverallocations/cache.go @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/gameserverallocations/cache_test.go b/pkg/gameserverallocations/cache_test.go index 7699c485c1..d597e42841 100644 --- a/pkg/gameserverallocations/cache_test.go +++ b/pkg/gameserverallocations/cache_test.go @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/gameserverallocations/find_test.go b/pkg/gameserverallocations/find_test.go index e8e2f29994..04f8126878 100644 --- a/pkg/gameserverallocations/find_test.go +++ b/pkg/gameserverallocations/find_test.go @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sdks/rust/src/types.rs b/sdks/rust/src/types.rs index 9f6a0ff467..a0cc73c7ff 100644 --- a/sdks/rust/src/types.rs +++ b/sdks/rust/src/types.rs @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sdks/unreal/Agones/Source/Agones/Agones.Build.cs b/sdks/unreal/Agones/Source/Agones/Agones.Build.cs index c59446b946..0f47978e6f 100644 --- a/sdks/unreal/Agones/Source/Agones/Agones.Build.cs +++ b/sdks/unreal/Agones/Source/Agones/Agones.Build.cs @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sdks/unreal/Agones/Source/Agones/Agones.cpp b/sdks/unreal/Agones/Source/Agones/Agones.cpp index 50e795dbc2..fcfb32048d 100644 --- a/sdks/unreal/Agones/Source/Agones/Agones.cpp +++ b/sdks/unreal/Agones/Source/Agones/Agones.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sdks/unreal/Agones/Source/Agones/AgonesHook.cpp b/sdks/unreal/Agones/Source/Agones/AgonesHook.cpp index 1a96bceb41..8a990d6c15 100644 --- a/sdks/unreal/Agones/Source/Agones/AgonesHook.cpp +++ b/sdks/unreal/Agones/Source/Agones/AgonesHook.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -10,13 +10,13 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// limitations under the License. #include "AgonesHook.h" #include "AgonesSettings.h" #include "Runtime/Online/HTTP/Public/Http.h" -#define LOCTEXT_NAMESPACE "AgonesHook" +#define LOCTEXT_NAMESPACE "AgonesHook" DEFINE_LOG_CATEGORY(LogAgonesHook); FAgonesHook::FAgonesHook() @@ -44,11 +44,11 @@ FAgonesHook::~FAgonesHook() void FAgonesHook::Tick(float DeltaTime) { - CurrentHealthTime += DeltaTime; - if (CurrentHealthTime >= Settings->HealthPingSeconds) - { - Health(); - CurrentHealthTime = 0.0f; + CurrentHealthTime += DeltaTime; + if (CurrentHealthTime >= Settings->HealthPingSeconds) + { + Health(); + CurrentHealthTime = 0.0f; } } @@ -59,7 +59,7 @@ bool FAgonesHook::IsTickable() const TStatId FAgonesHook::GetStatId() const { - RETURN_QUICK_DECLARE_CYCLE_STAT(FAgonesHook, STATGROUP_Tickables); + RETURN_QUICK_DECLARE_CYCLE_STAT(FAgonesHook, STATGROUP_Tickables); } bool FAgonesHook::IsTickableWhenPaused() const @@ -67,47 +67,47 @@ bool FAgonesHook::IsTickableWhenPaused() const return true; } -static TSharedRef MakeRequest(const FString& URL) -{ - FHttpModule* http = &FHttpModule::Get(); - TSharedRef req = http->CreateRequest(); - req->SetURL(URL); - req->SetVerb("POST"); - req->SetHeader("Content-Type", "application/json"); - req->SetContentAsString("{}"); - return req; +static TSharedRef MakeRequest(const FString& URL) +{ + FHttpModule* http = &FHttpModule::Get(); + TSharedRef req = http->CreateRequest(); + req->SetURL(URL); + req->SetVerb("POST"); + req->SetHeader("Content-Type", "application/json"); + req->SetContentAsString("{}"); + return req; +} + +void FAgonesHook::Ready() +{ + SendRequest(Settings->AgonesSidecarAddress + ReadySuffix); +} + +void FAgonesHook::Health() +{ + SendRequest(Settings->AgonesSidecarAddress + HealthSuffix); +} + +void FAgonesHook::Shutdown() +{ + SendRequest(Settings->AgonesSidecarAddress + ShutdownSuffix); } -void FAgonesHook::Ready() -{ - SendRequest(Settings->AgonesSidecarAddress + ReadySuffix); -} - -void FAgonesHook::Health() -{ - SendRequest(Settings->AgonesSidecarAddress + HealthSuffix); -} - -void FAgonesHook::Shutdown() -{ - SendRequest(Settings->AgonesSidecarAddress + ShutdownSuffix); -} - bool FAgonesHook::SendRequest(const FString& URL) { - TSharedRef req = MakeRequest(URL); - bool bSuccess = req->ProcessRequest(); - if (Settings->bDebugLogEnabled) - { - if (bSuccess) - { - UE_LOG(LogAgonesHook, Log, TEXT("Send: %s"), *URL); - } - else - { - UE_LOG(LogAgonesHook, Error, TEXT("Failed sending: %s"), *URL); - } + TSharedRef req = MakeRequest(URL); + bool bSuccess = req->ProcessRequest(); + if (Settings->bDebugLogEnabled) + { + if (bSuccess) + { + UE_LOG(LogAgonesHook, Log, TEXT("Send: %s"), *URL); + } + else + { + UE_LOG(LogAgonesHook, Error, TEXT("Failed sending: %s"), *URL); + } } return bSuccess; } diff --git a/sdks/unreal/Agones/Source/Agones/AgonesHook.h b/sdks/unreal/Agones/Source/Agones/AgonesHook.h index 7520951e6c..017af68a4c 100644 --- a/sdks/unreal/Agones/Source/Agones/AgonesHook.h +++ b/sdks/unreal/Agones/Source/Agones/AgonesHook.h @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -10,7 +10,7 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// limitations under the License. #pragma once diff --git a/sdks/unreal/Agones/Source/Agones/AgonesSettings.cpp b/sdks/unreal/Agones/Source/Agones/AgonesSettings.cpp index 838d8d4b71..f03a545fa2 100644 --- a/sdks/unreal/Agones/Source/Agones/AgonesSettings.cpp +++ b/sdks/unreal/Agones/Source/Agones/AgonesSettings.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sdks/unreal/Agones/Source/Agones/Public/Agones.h b/sdks/unreal/Agones/Source/Agones/Public/Agones.h index 12fbb4f0d0..2465b3126f 100644 --- a/sdks/unreal/Agones/Source/Agones/Public/Agones.h +++ b/sdks/unreal/Agones/Source/Agones/Public/Agones.h @@ -1,4 +1,4 @@ -// Copyright 2019 Google Inc. All Rights Reserved. +// Copyright 2019 Google LLC All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/sdks/unreal/Agones/Source/Agones/Public/AgonesSettings.h b/sdks/unreal/Agones/Source/Agones/Public/AgonesSettings.h index f0fb3b7145..9df75d124a 100644 --- a/sdks/unreal/Agones/Source/Agones/Public/AgonesSettings.h +++ b/sdks/unreal/Agones/Source/Agones/Public/AgonesSettings.h @@ -1,15 +1,15 @@ -// Copyright 2019 Google Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and +// Copyright 2019 Google LLC All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and // limitations under the License. #pragma once