Merge branch 'master' into feature/KASM-2117_watermark

unix/vncserver

@@ -1171,6 +1171,7 @@ sub DefineFilePathsAndStuff {
 
   $KasmVNC::Users::vncPasswdBin = $exedir . "kasmvncpasswd";
   $KasmVNC::Users::logger = $logger;
+  $KasmVNC::Config::logger = $logger;
 
   $vncSystemConfigDir = "/etc/kasmvnc";
   if ($ENV{KASMVNC_DEVELOPMENT}) {
@@ -2023,7 +2024,7 @@ sub DefineConfigToCLIConversion {
           $self = shift;
 
           my @values = @{ listify($self->configValues()) };
-          
+
           my $valuesStr = "";
           foreach $value (@values) {
             $valuesStr = $valuesStr . "-http-header '$value' "
@@ -2286,6 +2287,39 @@ sub DefineConfigToCLIConversion {
           isPresent($value) && $value ne 'auto';
         }
     }),
+    KasmVNC::CliOption->new({
+        name => 'hw3d',
+        configKeys => [
+          KasmVNC::ConfigKey->new({
+            name => "desktop.gpu.hw3d",
+            type => KasmVNC::ConfigKey::BOOLEAN
+          })
+        ],
+        toStringSub => sub {
+          $self = shift;
+          my $value = $self->configValue();
+
+          switch($value) {
+            case 'true' {
+              $valuesStr = '-hw3d ';
+            }
+            case 'false' {
+              $valuesStr = ' ';
+            }
+          }
+
+          return $valuesStr;
+        }
+    }),
+    KasmVNC::CliOption->new({
+        name => 'drinode',
+        configKeys => [
+          KasmVNC::ConfigKey->new({
+            name => "desktop.gpu.drinode",
+            type => KasmVNC::ConfigKey::ANY
+          })
+        ]
+    }),
   );
 
   %cliArgMap = map { ("-" . $_->{name}) => $_ } @xvncOptions;
@@ -2798,5 +2832,6 @@ sub SetAppSettingsFromConfigAndCli {
 }
 
 sub InitLogger {
-  $logger = KasmVNC::Logger->new();
+  my $debugEnabled = any { $_ eq "-debug" } @ARGV;
+  $logger = KasmVNC::Logger->new({ level => $debugEnabled ? "debug" : "warn" });
 }