Revision 7e3c1da6 daemons/import-export

b/daemons/import-export
381 381
               (utils.ShellQuoteArgs(GetSocatCommand(mode)),
382 382
                socat_stderr_fd))
383 383

  
384
  # TODO: Make compression configurable
384
  compr = options.compress
385

  
386
  assert compr in constants.IEC_ALL
385 387

  
386 388
  if mode == constants.IEM_IMPORT:
387
    transport_cmd = "%s | gunzip -c" % socat_cmd
389
    if compr == constants.IEC_GZIP:
390
      transport_cmd = "%s | gunzip -c" % socat_cmd
391
    else:
392
      transport_cmd = socat_cmd
388 393
  elif mode == constants.IEM_EXPORT:
389
    transport_cmd = "gzip -c | %s" % socat_cmd
394
    if compr == constants.IEC_GZIP:
395
      transport_cmd = "gzip -c | %s" % socat_cmd
396
    else:
397
      transport_cmd = socat_cmd
390 398
  else:
391 399
    raise Error("Invalid mode")
392 400

  
......
554 562
  parser.add_option("--connect-timeout", dest="connect_timeout", action="store",
555 563
                    type="int", default=DEFAULT_CONNECT_TIMEOUT,
556 564
                    help="Timeout for connection to be established (seconds)")
565
  parser.add_option("--compress", dest="compress", action="store",
566
                    type="choice", help="Compression method",
567
                    metavar="[%s]" % "|".join(constants.IEC_ALL),
568
                    choices=list(constants.IEC_ALL), default=constants.IEC_GZIP)
557 569
  parser.add_option("--cmd-prefix", dest="cmd_prefix", action="store",
558 570
                    type="string", help="Command prefix")
559 571
  parser.add_option("--cmd-suffix", dest="cmd_suffix", action="store",

Also available in: Unified diff